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-27 03:29:47
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28680/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Moved ::proto_node_class::proto_node_type to ::proto_node_type. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** browser.cpp 27 Nov 2005 03:05:51 -0000 1.98 --- browser.cpp 27 Nov 2005 03:29:37 -0000 1.99 *************** *** 75,78 **** --- 75,79 ---- class proto_node; + class proto_node_type; class proto_impl_cloner; *************** *** 82,92 **** * @brief <code>node_class</code> for <code>PROTO</code>s. * ! * The proto_node_class is OpenVRML's in-memory representation of a ! * <code>PROTO</code> (as opposed to a <code>PROTO</code> instance). ! * Through the <code>proto_node::proto_node_type</code> intermediary, it ! * facilitates spawning any number of <code>proto_node</code> instances. */ class OPENVRML_LOCAL proto_node_class : public node_class { friend class proto_node; friend class proto_impl_cloner; --- 83,95 ---- * @brief <code>node_class</code> for <code>PROTO</code>s. * ! * The <code>proto_node_class</code> is %OpenVRML's in-memory ! * representation of a <code>PROTO</code> (as opposed to a ! * <code>PROTO</code> instance). Through the <code>proto_node_type</code> ! * intermediary, it facilitates spawning any number of ! * <code>proto_node</code> instances. */ class OPENVRML_LOCAL proto_node_class : public node_class { friend class proto_node; + friend class proto_node_type; friend class proto_impl_cloner; *************** *** 126,148 **** is_map_t is_map; - class proto_node_type : public node_type { - node_interface_set interfaces_; - - public: - proto_node_type(const proto_node_class & node_class, - const std::string & id, - const node_interface_set & interfaces) - throw (unsupported_interface, std::bad_alloc); - virtual ~proto_node_type() throw (); - - private: - virtual const node_interface_set & do_interfaces() const throw (); - virtual const boost::intrusive_ptr<node> - do_create_node(const boost::shared_ptr<openvrml::scope> & scope, - const initial_value_map & initial_values) const - throw (std::bad_alloc); - }; - - public: proto_node_class( --- 129,132 ---- *************** *** 162,165 **** --- 146,173 ---- + /** + * @internal + * + * @brief <code>node_type</code> for PROTO node instances. + */ + class OPENVRML_LOCAL proto_node_type : public node_type { + node_interface_set interfaces_; + + public: + proto_node_type(const proto_node_class & node_class, + const std::string & id, + const node_interface_set & interfaces) + throw (unsupported_interface, std::bad_alloc); + virtual ~proto_node_type() throw (); + + private: + virtual const node_interface_set & do_interfaces() const throw (); + virtual const boost::intrusive_ptr<node> + do_create_node(const boost::shared_ptr<openvrml::scope> & scope, + const initial_value_map & initial_values) const + throw (std::bad_alloc); + }; + + class OPENVRML_LOCAL abstract_proto_node : public openvrml::node { public: *************** *** 936,940 **** * @exception std::bad_alloc if memory allocation fails. */ - proto_node_class:: proto_node_type::proto_node_type(const proto_node_class & node_class, const std::string & id, --- 944,947 ---- *************** *** 963,967 **** * @brief Destroy. */ ! proto_node_class::proto_node_type::~proto_node_type() throw () {} --- 970,974 ---- * @brief Destroy. */ ! proto_node_type::~proto_node_type() throw () {} *************** *** 972,976 **** */ const node_interface_set & ! proto_node_class::proto_node_type::do_interfaces() const throw () { return this->interfaces_; --- 979,983 ---- */ const node_interface_set & ! proto_node_type::do_interfaces() const throw () { return this->interfaces_; *************** *** 978,982 **** const boost::intrusive_ptr<node> ! proto_node_class::proto_node_type:: do_create_node(const boost::shared_ptr<openvrml::scope> & scope, const initial_value_map & initial_values) const --- 985,989 ---- const boost::intrusive_ptr<node> ! proto_node_type:: do_create_node(const boost::shared_ptr<openvrml::scope> & scope, const initial_value_map & initial_values) const |
|
From: Braden M. <br...@us...> - 2005-11-27 03:29:47
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28680 Modified Files: ChangeLog Log Message: Moved ::proto_node_class::proto_node_type to ::proto_node_type. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1044 retrieving revision 1.1045 diff -C2 -d -r1.1044 -r1.1045 *** ChangeLog 27 Nov 2005 03:05:51 -0000 1.1044 --- ChangeLog 27 Nov 2005 03:29:37 -0000 1.1045 *************** *** 1,4 **** --- 1,9 ---- 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Moved + ::proto_node_class::proto_node_type to ::proto_node_type. + + 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Removed trailing whitespace. |
|
From: Braden M. <br...@us...> - 2005-11-27 03:05:59
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25723 Modified Files: ChangeLog Log Message: Removed trailing whitespace. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1043 retrieving revision 1.1044 diff -C2 -d -r1.1043 -r1.1044 *** ChangeLog 27 Nov 2005 02:57:17 -0000 1.1043 --- ChangeLog 27 Nov 2005 03:05:51 -0000 1.1044 *************** *** 1,4 **** --- 1,9 ---- 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Removed trailing + whitespace. + + 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp (create_root_scope): Take a reference to a const openvrml::browser as an argument. |
|
From: Braden M. <br...@us...> - 2005-11-27 03:05:59
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25723/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Removed trailing whitespace. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** browser.cpp 27 Nov 2005 02:57:18 -0000 1.97 --- browser.cpp 27 Nov 2005 03:05:51 -0000 1.98 *************** *** 2763,2767 **** }; ! class OPENVRML_LOCAL externproto_node : public openvrml::abstract_proto_node { --- 2763,2767 ---- }; ! class OPENVRML_LOCAL externproto_node : public openvrml::abstract_proto_node { *************** *** 2811,2815 **** field_map field_map_; ! public: externproto_node(const externproto_node_type & type, --- 2811,2815 ---- field_map field_map_; ! public: externproto_node(const externproto_node_type & type, *************** *** 4083,4087 **** using openvrml::node_interface; using openvrml::node_interface_set; ! std::auto_ptr<openvrml::scope> root_scope(new openvrml::scope(uri)); boost::shared_ptr<openvrml::node_class> node_class; --- 4083,4087 ---- using openvrml::node_interface; using openvrml::node_interface_set; ! std::auto_ptr<openvrml::scope> root_scope(new openvrml::scope(uri)); boost::shared_ptr<openvrml::node_class> node_class; *************** *** 8246,8250 **** url_(&url) {} ! void operator()() const throw () try { using std::endl; --- 8246,8250 ---- url_(&url) {} ! void operator()() const throw () try { using std::endl; *************** *** 8260,8264 **** try { using boost::algorithm::iequals; ! std::auto_ptr<resource_istream> in = scene.get_resource(url); if (!(*in)) { throw unreachable_url(); } --- 8260,8264 ---- try { using boost::algorithm::iequals; ! std::auto_ptr<resource_istream> in = scene.get_resource(url); if (!(*in)) { throw unreachable_url(); } |
|
From: Braden M. <br...@us...> - 2005-11-27 02:57:25
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24523 Modified Files: ChangeLog Log Message: Take a reference to a const openvrml::browser as an argument. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1042 retrieving revision 1.1043 diff -C2 -d -r1.1042 -r1.1043 *** ChangeLog 26 Nov 2005 22:04:33 -0000 1.1042 --- ChangeLog 27 Nov 2005 02:57:17 -0000 1.1043 *************** *** 1,4 **** --- 1,9 ---- 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp (create_root_scope): Take a + reference to a const openvrml::browser as an argument. + + 2005-11-26 Braden McDaniel <br...@en...> + Made create_root_scope a nonmember function. |
|
From: Braden M. <br...@us...> - 2005-11-27 02:57:25
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24523/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Take a reference to a const openvrml::browser as an argument. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** browser.cpp 26 Nov 2005 22:04:33 -0000 1.96 --- browser.cpp 27 Nov 2005 02:57:18 -0000 1.97 *************** *** 4069,4075 **** /** * @brief Create a root scope. */ std::auto_ptr<openvrml::scope> ! create_root_scope(openvrml::browser & browser, const std::string & uri) throw (std::bad_alloc) { --- 4069,4081 ---- /** * @brief Create a root scope. + * + * @param browser a browser. + * @param uri identifier for the root scope. + * + * @exception std::bad_alloc if memory allocation fails. */ std::auto_ptr<openvrml::scope> ! create_root_scope(const openvrml::browser & browser, ! const std::string & uri) throw (std::bad_alloc) { |
|
From: Braden M. <br...@us...> - 2005-11-26 22:04:42
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3069/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g X3DVrmlParser.g browser.cpp browser.h Log Message: Made create_root_scope a nonmember function. Index: X3DVrmlParser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** X3DVrmlParser.g 30 Oct 2005 03:20:17 -0000 1.5 --- X3DVrmlParser.g 26 Nov 2005 22:04:33 -0000 1.6 *************** *** 202,206 **** profile_id profile = invalid_profile_id; std::auto_ptr<openvrml::scope> root_scope_auto_ptr = ! scene.browser().create_root_scope(this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } --- 202,206 ---- profile_id profile = invalid_profile_id; std::auto_ptr<openvrml::scope> root_scope_auto_ptr = ! create_root_scope(scene.browser(), this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** browser.cpp 26 Nov 2005 20:18:09 -0000 1.95 --- browser.cpp 26 Nov 2005 22:04:33 -0000 1.96 *************** *** 4066,4069 **** --- 4066,5818 ---- return result_uri; } + + /** + * @brief Create a root scope. + */ + std::auto_ptr<openvrml::scope> + create_root_scope(openvrml::browser & browser, const std::string & uri) + throw (std::bad_alloc) [...3462 lines suppressed...] - "title") - }; - static const node_interface_set - interface_set(interfaces, interfaces + 2); - node_class = - this->node_class_map_.find("urn:X-openvrml:node:WorldInfo"); - assert(node_class); - root_scope->add_type(node_class->create_type("WorldInfo", - interface_set)); - } - } catch (std::invalid_argument & ex) { - OPENVRML_PRINT_EXCEPTION_(ex); - } - return root_scope; - } - - /** * @internal * --- 6534,6537 ---- Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** browser.h 26 Nov 2005 20:18:09 -0000 1.35 --- browser.h 26 Nov 2005 22:04:33 -0000 1.36 *************** *** 338,344 **** private: - OPENVRML_LOCAL std::auto_ptr<scope> - create_root_scope(const std::string & uri) throw (std::bad_alloc); - virtual std::auto_ptr<resource_istream> do_get_resource(const std::string & uri) = 0; --- 338,341 ---- Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Vrml97Parser.g 26 Nov 2005 20:18:09 -0000 1.36 --- Vrml97Parser.g 26 Nov 2005 22:04:33 -0000 1.37 *************** *** 627,631 **** { std::auto_ptr<openvrml::scope> root_scope_auto_ptr = ! scene.browser().create_root_scope(this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } --- 627,631 ---- { std::auto_ptr<openvrml::scope> root_scope_auto_ptr = ! create_root_scope(scene.browser(), this->uri); const boost::shared_ptr<openvrml::scope> root_scope(root_scope_auto_ptr); } |
|
From: Braden M. <br...@us...> - 2005-11-26 22:04:40
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3069 Modified Files: ChangeLog Log Message: Made create_root_scope a nonmember function. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1041 retrieving revision 1.1042 diff -C2 -d -r1.1041 -r1.1042 *** ChangeLog 26 Nov 2005 20:18:09 -0000 1.1041 --- ChangeLog 26 Nov 2005 22:04:33 -0000 1.1042 *************** *** 1,4 **** --- 1,17 ---- 2005-11-26 Braden McDaniel <br...@en...> + Made create_root_scope a nonmember function. + + * src/libopenvrml/openvrml/Vrml97Parser.g + (Vrml97Parser::vrmlScene): Changed to use ::create_root_scope. + * src/libopenvrml/openvrml/X3DVrmlParser.g + (X3DVrmlParser::vrmlScene): Changed to use ::create_root_scope. + * src/libopenvrml/openvrml/browser.cpp: Made create_root_scope a + nonmember function. + * src/libopenvrml/openvrml/browser.h: Removed + openvrml::browser::create_root_scope. + + 2005-11-26 Braden McDaniel <br...@en...> + Exposed means to add and retrieve node_classes from the browser's node_class map as part of openvrml::browser's public interface. |
|
From: Braden M. <br...@us...> - 2005-11-26 20:18:22
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15986/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g browser.cpp browser.h Log Message: Exposed means to add and retrieve node_classes from the browser's node_class map as part of openvrml::browser's public interface. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** browser.cpp 26 Nov 2005 08:14:47 -0000 1.94 --- browser.cpp 26 Nov 2005 20:18:09 -0000 1.95 *************** *** 3603,3606 **** --- 3603,3611 ---- }; + inline bool relative(const uri & id) + { + return id.scheme().empty(); + } + uri::grammar::grammar(uri & uri_ref) throw (): uri_ref(uri_ref) *************** *** 3973,3978 **** using std::string; ! assert(this->scheme().empty()); ! assert(!absolute_uri.scheme().empty()); string result = absolute_uri.scheme() + ':'; --- 3978,3983 ---- using std::string; ! assert(relative(*this)); ! assert(!relative(absolute_uri)); string result = absolute_uri.scheme() + ':'; *************** *** 4491,4494 **** --- 4496,4594 ---- /** + * @class openvrml::node_class_id + * + * @brief Identifier for <code>node_class</code>es. + * + * <code>node_class</code> identifiers take the following form: + * + * <pre> + * absolute-uri ['#' proto-id ['#' proto-id [...]]] + * </pre> + * + * A <code>node_class</code> identifier is basically like an absolute URI; + * except the fragment identifier syntax has been extended to support referring + * to nested <code>PROTO</code>s. + * + * For example, supposing the following VRML world resides at + * <code>%http://example.com/example.wrl</code>: + * + * <pre> + * #VRML V2.0 utf8 + * + * PROTO Outer [] { + * PROTO Inner [] { Group {} } + * Group {} + * } + * </pre> + * + * The <code>node_class_id</code> string for <code>Outer</code> would be + * <code>http://example.com/example.wrl#Outer</code>; and for + * <code>Inner</code>, + * <code>http://example.com/example.wrl#Outer#Inner</code>. + */ + + /** + * @internal + * + * @var std::string openvrml::node_class_id::id_ + * + * @brief The identifier string. + */ + + /** + * @brief Construct from a <code>const char *</code>. + * + * @param id the identifier. + * + * @exception std::invalid_argument if @p id is not a valid + * <code>node_class</code> identifier. + * @exception std::bad_alloc if memory allocation fails. + * + * @todo Need to make sure the fragment part is valid. + */ + openvrml::node_class_id::node_class_id(const char * id) + throw (std::invalid_argument, std::bad_alloc): + id_(id) + { + if (relative(uri(this->id_))) { + throw std::invalid_argument('<' + this->id_ + "> is not a valid " + "node_class identifier"); + } + } + + /** + * @brief Construct from a <code>std::string</code>. + * + * @param id the identifier. + * + * @exception std::invalid_argument if @p id is not a valid + * <code>node_class</code> identifier. + * @exception std::bad_alloc if memory allocation fails. + * + * @todo Need to make sure the fragment part is valid. + */ + openvrml::node_class_id::node_class_id(const std::string & id) + throw (std::invalid_argument, std::bad_alloc): + id_(id) + { + if (relative(uri(this->id_))) { + throw std::invalid_argument('<' + this->id_ + "> is not a valid " + "node_class identifier"); + } + } + + /** + * @brief Convert to a <code>std::string</code>. + * + * @return the <code>node_class</code> identifier as a + * <code>std::string</code>. + */ + openvrml::node_class_id::operator std::string() const + { + return this->id_; + } + + + /** * @class openvrml::browser * *************** *** 4619,4623 **** openvrml::browser::node_class_map:: insert(const std::string & id, ! const boost::shared_ptr<node_class> & node_class) { boost::mutex::scoped_lock lock(this->mutex_); --- 4719,4723 ---- openvrml::browser::node_class_map:: insert(const std::string & id, ! const boost::shared_ptr<openvrml::node_class> & node_class) { boost::mutex::scoped_lock lock(this->mutex_); *************** *** 4626,4629 **** --- 4726,4742 ---- /** + * @brief Remove a <code>node_class</code>. + * + * @param id the implementation identifier. + * + * @return @c true if a <code>node_class</code> is removed; @c false otherwise. + */ + bool openvrml::browser::node_class_map::remove(const std::string & id) + { + boost::mutex::scoped_lock lock(this->mutex_); + return this->map_.erase(id) > 0; + } + + /** * @brief Find a <code>node_class</code>. * *************** *** 4639,4643 **** return (pos != this->map_.end()) ? pos->second ! : boost::shared_ptr<node_class>(); } --- 4752,4756 ---- return (pos != this->map_.end()) ? pos->second ! : boost::shared_ptr<openvrml::node_class>(); } *************** *** 6691,6694 **** --- 6804,6852 ---- /** + * @brief Add a <code>node_class</code>. + * + * If a <code>node_class</code> identified by @p id has already been added to + * the browser, it will be replaced. + * + * @warning If <code>std::bad_alloc</code> is thrown here, the + * <code>browser</code>'s <code>node_class</code> map is left in an + * unknown state. In all likelihood any preexisting entry in the map + * with the same implementation identifier as @p id will have been + * removed. + * + * @param id a <code>node_class</code> identifier. + * @param nc a <code>shared_ptr</code> to a <code>node_class</code> + * + * @exception std::invalid_argument if @p nc is null. + * @exception std::bad_alloc if memory allocation fails. + */ + void + openvrml::browser:: + add_node_class(const node_class_id & id, + const boost::shared_ptr<openvrml::node_class> & nc) + throw (std::invalid_argument, std::bad_alloc) + { + if (!nc) { + throw std::invalid_argument("cannot add null node_class pointer"); + } + this->node_class_map_.remove(id); // Remove any existing entry. + this->node_class_map_.insert(id, nc); + } + + /** + * @brief Get the <code>node_class</code> corresponding to @p id. + * + * @param id a <code>node_class</code> identifier. + * + * @return the <code>node_class</code> corresponding to @p id; or a null + * pointer if no such <code>node_class</code> exists. + */ + const boost::shared_ptr<openvrml::node_class> + openvrml::browser::node_class(const node_class_id & id) const throw () + { + return this->node_class_map_.find(id); + } + + /** * @brief Get the root nodes for the browser. * *************** *** 7926,7930 **** throw (bad_path, std::bad_alloc) { ! assert(relative_uri.scheme().empty()); using std::string; --- 8084,8088 ---- throw (bad_path, std::bad_alloc) { ! assert(relative(relative_uri)); using std::string; *************** *** 8304,8308 **** const uri urlElement(url[i]); const string value = ! urlElement.scheme().empty() ? urlElement.resolve_against(uri(this->url())) : urlElement; --- 8462,8466 ---- const uri urlElement(url[i]); const string value = ! relative(urlElement) ? urlElement.resolve_against(uri(this->url())) : urlElement; *************** *** 8353,8357 **** // absolute file URL. // ! const uri absolute_uri = !test_uri.scheme().empty() ? test_uri : (!this->parent() && this->url().empty()) --- 8511,8515 ---- // absolute file URL. // ! const uri absolute_uri = !relative(test_uri) ? test_uri : (!this->parent() && this->url().empty()) Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** browser.h 15 Nov 2005 00:28:43 -0000 1.34 --- browser.h 26 Nov 2005 20:18:09 -0000 1.35 *************** *** 171,174 **** --- 171,186 ---- + class OPENVRML_API node_class_id { + std::string id_; + + public: + node_class_id(const char * id) + throw (std::invalid_argument, std::bad_alloc); + node_class_id(const std::string & id) + throw (std::invalid_argument, std::bad_alloc); + operator std::string() const; + }; + + class viewer; class scene; *************** *** 195,201 **** void init(viewpoint_node * initial_viewpoint, double timestamp); ! const boost::shared_ptr<node_class> insert(const std::string & id, ! const boost::shared_ptr<node_class> & node_class); const boost::shared_ptr<node_class> --- 207,215 ---- void init(viewpoint_node * initial_viewpoint, double timestamp); ! const boost::shared_ptr<openvrml::node_class> insert(const std::string & id, ! const boost::shared_ptr<openvrml::node_class> & node_class); ! ! bool remove(const std::string & id); const boost::shared_ptr<node_class> *************** *** 249,252 **** --- 263,272 ---- virtual ~browser() throw (); + void add_node_class(const node_class_id & id, + const boost::shared_ptr<openvrml::node_class> & nc) + throw (std::invalid_argument, std::bad_alloc); + const boost::shared_ptr<openvrml::node_class> + node_class(const node_class_id & id) const throw (); + const std::vector<boost::intrusive_ptr<node> > & root_nodes() const throw (); Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Vrml97Parser.g 7 Nov 2005 06:55:21 -0000 1.35 --- Vrml97Parser.g 26 Nov 2005 20:18:09 -0000 1.36 *************** *** 691,695 **** ; ! proto[openvrml::browser & browser, const boost::shared_ptr<openvrml::scope> & scope] options { defaultErrorHandler=false; } { --- 691,696 ---- ; ! proto[openvrml::browser & browser, ! const boost::shared_ptr<openvrml::scope> & scope] options { defaultErrorHandler=false; } { *************** *** 732,738 **** do { impl_id = '#' + proto_scope->id() + impl_id; ! } while ((proto_scope = proto_scope->parent())); impl_id = scope->id() + impl_id; ! browser.node_class_map_.insert(impl_id, node_class); // --- 733,739 ---- do { impl_id = '#' + proto_scope->id() + impl_id; ! } while ((proto_scope = proto_scope->parent())->parent()); impl_id = scope->id() + impl_id; ! browser.add_node_class(impl_id, node_class); // *************** *** 951,955 **** ++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(), --- 952,956 ---- ++uri) { const shared_ptr<openvrml::node_class> node_class = ! browser.node_class(*uri); if (node_class) { node_type = node_class->create_type(id->getText(), *************** *** 966,970 **** uri != alt_uris.end(); ++uri) { ! browser.node_class_map_.insert(*uri, externproto_class); } --- 967,971 ---- uri != alt_uris.end(); ++uri) { ! browser.add_node_class(*uri, externproto_class); } |
|
From: Braden M. <br...@us...> - 2005-11-26 20:18:17
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15986 Modified Files: ChangeLog Log Message: Exposed means to add and retrieve node_classes from the browser's node_class map as part of openvrml::browser's public interface. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1040 retrieving revision 1.1041 diff -C2 -d -r1.1040 -r1.1041 *** ChangeLog 26 Nov 2005 08:14:46 -0000 1.1040 --- ChangeLog 26 Nov 2005 20:18:09 -0000 1.1041 *************** *** 1,4 **** --- 1,40 ---- 2005-11-26 Braden McDaniel <br...@en...> + Exposed means to add and retrieve node_classes from the browser's + node_class map as part of openvrml::browser's public interface. + + * src/libopenvrml/openvrml/Vrml97Parser.g + (Vrml97Parser::proto): Fixed composition of impl_id; use + openvrml::browser::add_node_class instead of + openvrml::browser::node_class_map::insert. + (Vrml97Parser::externproto): Use openvrml::browser::node_class + instead of openvrml::browser::node_class_map::find; use + openvrml::browser::add_node_class instead of + openvrml::browser::node_class_map::insert. + * src/libopenvrml/openvrml/browser.cpp + (relative): Added function to check whether a URI is relative. + (uri::resolve_against): Changed to use relative. + (openvrml::node_class_id::node_class_id(const char *)): Added + constructor. + (openvrml::node_class_id::node_class_id(const std::string &)): + Added constructor. + (openvrml::node_class_id::operator std::string): Added conversion + operator. + (openvrml::browser::node_class_map::remove): Added function to + remove a node_class from the map. + (openvrml::browser::add_node_class): Added function to add a + node_class to the browser's node_class map. + (openvrml::browser::node_class): Added function to retrieve a + node_class from the browser's node_class map. + (create_file_url): Changed to use relative. + (openvrml::scene::load_url): Changed to use relative. + (openvrml::scene::get_resource): Changed to use relative. + * src/libopenvrml/openvrml/browser.h: Added class + openvrml::node_class_id; added functions + openvrml::browser::node_class_map::remove, + openvrml::browser::add_node_class, openvrml::browser::node_class. + + 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2005-11-26 08:14:55
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20472 Modified Files: ChangeLog Log Message: Doc-comment improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1039 retrieving revision 1.1040 diff -C2 -d -r1.1039 -r1.1040 *** ChangeLog 26 Nov 2005 06:30:39 -0000 1.1039 --- ChangeLog 26 Nov 2005 08:14:46 -0000 1.1040 *************** *** 1,4 **** --- 1,8 ---- 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Doc-comment improvements. + + 2005-11-26 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/vrml97node.cpp (shape_node::do_render_child): Set the modified flag for the |
|
From: Braden M. <br...@us...> - 2005-11-26 08:14:55
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20472/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Doc-comment improvements. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** browser.cpp 22 Nov 2005 02:39:25 -0000 1.93 --- browser.cpp 26 Nov 2005 08:14:47 -0000 1.94 *************** *** 4494,4497 **** --- 4494,4501 ---- * * @brief Encapsulates a VRML browser. + * + * <code>browser</code> is the foundation of the OpenVRML runtime. Users need + * to inherit this class and override <code>browser::do_get_resource</code> and + * provide an implementation of <code>resource_istream</code>. */ *************** *** 6920,6932 **** /** * @brief Fetch a network resource. * ! * Called by <code>browser::get_resource</code>. * ! * @param uri a Uniform Resource Identifier. * * @return the requested resource as a stream. * ! * @fn std::auto_ptr<openvrml::resource_istream> openvrml::browser::do_get_resource(const std::string & uri) */ --- 6924,7031 ---- /** + * @fn std::auto_ptr<openvrml::resource_istream> openvrml::browser::do_get_resource(const std::string & uri) + * * @brief Fetch a network resource. * ! * Called by <code>browser::get_resource</code>, clients of %OpenVRML are ! * required to provide an implementation for this function. %OpenVRML depends ! * on the implementation of this function for all of its input needs. As such, ! * what kind of resources %OpenVRML is capable of resolving is entirely ! * dependent on code provided by the application. A trivial implementation ! * designed to handle only <code>file</code> resources can use ! * <code>std::filebuf</code>: * ! * @code ! * std::auto_ptr<openvrml::resource_istream> ! * my_browser::do_get_resource(const std::string & uri) ! * { ! * using std::auto_ptr; ! * using std::invalid_argument; ! * using std::string; ! * using openvrml::resource_istream; ! * ! * class file_resource_istream : public resource_istream { ! * std::string url_; ! * std::filebuf buf_; ! * ! * public: ! * explicit file_resource_istream(const std::string & path): ! * resource_istream(&this->buf_) ! * { ! * this->buf_.open(path.c_str(), ios_base::in); ! * } ! * ! * void url(const std::string & str) throw (std::bad_alloc) ! * { ! * this->url_ = str; ! * } ! * ! * virtual const std::string url() const throw () ! * { ! * return this->url_; ! * } ! * ! * virtual const std::string type() const throw () ! * { ! * // ! * // A real application should use OS facilities for this; ! * // however, that is beyond the scope of this example (which ! * // is intended to be portable and stupid). ! * // ! * using std::string; ! * using boost::algorithm::iequals; ! * string media_type = "application/octet-stream"; ! * const string::size_type dot_pos = this->url_.rfind('.'); ! * if (dot_pos == string::npos ! * || this->url_.size() < dot_pos + 1) { ! * return media_type; ! * } ! * const string ext = this->url_.substr(dot_pos + 1); ! * if (iequals(ext, "wrl")) { ! * media_type = "model/vrml"; ! * } else if (iequals(ext, "png")) { ! * media_type = "image/png"; ! * } else if (iequals(ext, "jpg") || iequals(ext, "jpeg")) { ! * media_type = "image/jpeg"; ! * } ! * return media_type; ! * } ! * ! * virtual bool data_available() const throw () ! * { ! * return !!(*this); ! * } ! * }; ! * ! * const string scheme = uri.substr(0, uri.find_first_of(':')); ! * if (scheme != "file") { ! * throw invalid_argument('\"' + scheme + "\" URI scheme not " ! * "supported"); ! * } ! * // ! * // file:// ! * // ^ ! * // 01234567 ! * // ! * string path = uri.substr(uri.find_first_of('/', 7)); ! * ! * auto_ptr<resource_istream> in(new file_resource_istream(path)); ! * static_cast<file_resource_istream *>(in.get())->url(uri); ! * ! * return in; ! * } ! * @endcode ! * ! * The @p uri parameter is provided by %OpenVRML and can be assumed to be an ! * absolute URI. As such, it will always have a scheme through which the client ! * code can choose a resolution mechanism. For more information on URI syntax, ! * see <a href="http://www.isi.edu/in-notes/rfc2396.txt">Internet ! * RFC 2396</a>. ! * ! * @param uri an absolute Uniform Resource Identifier. * * @return the requested resource as a stream. * ! * @sa http://www.isi.edu/in-notes/rfc2396.txt */ |
|
From: Braden M. <br...@us...> - 2005-11-26 06:30:48
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26375/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Set the modified flag for the geometry node if the appearance has been modified. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** vrml97node.cpp 21 Nov 2005 06:40:12 -0000 1.84 --- vrml97node.cpp 26 Nov 2005 06:30:40 -0000 1.85 *************** *** 17793,17796 **** --- 17793,17803 ---- node_cast<geometry_node *>(this->geometry_.sfnode::value().get()); + // + // If the appearance has changed, we need to rerender the geometry. + // + if (geometry && appearance && appearance->modified()) { + geometry->modified(true); + } + if (this->viewerObject && (this->modified() || (appearance && appearance->modified()) |
|
From: Braden M. <br...@us...> - 2005-11-26 06:30:47
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26375 Modified Files: ChangeLog Log Message: Set the modified flag for the geometry node if the appearance has been modified. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1038 retrieving revision 1.1039 diff -C2 -d -r1.1038 -r1.1039 *** ChangeLog 22 Nov 2005 02:39:25 -0000 1.1038 --- ChangeLog 26 Nov 2005 06:30:39 -0000 1.1039 *************** *** 1,2 **** --- 1,8 ---- + 2005-11-26 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/vrml97node.cpp + (shape_node::do_render_child): Set the modified flag for the + geometry node if the appearance has been modified. + 2005-11-21 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-22 02:39:34
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv590/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Implemented "modified" virtual function. Delegates to the first implementation node. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** browser.cpp 7 Nov 2005 06:55:21 -0000 1.92 --- browser.cpp 22 Nov 2005 02:39:25 -0000 1.93 *************** *** 373,376 **** --- 373,378 ---- virtual ~proto_node() throw (); + virtual bool modified() const; + private: virtual void do_initialize(double timestamp) *************** *** 2243,2246 **** --- 2245,2261 ---- /** + * @brief Indicate whether the node needs to be rerendered. + * + * @return @c true if the node has changed and needs to be rerendered; + * @c false otherwise. + */ + bool proto_node::modified() const + { + return !this->impl_nodes.empty() + ? this->impl_nodes.front()->modified() + : false; + } + + /** * @brief Initialize. * |
|
From: Braden M. <br...@us...> - 2005-11-22 02:39:34
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv590 Modified Files: ChangeLog Log Message: Implemented "modified" virtual function. Delegates to the first implementation node. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1037 retrieving revision 1.1038 diff -C2 -d -r1.1037 -r1.1038 *** ChangeLog 21 Nov 2005 06:40:12 -0000 1.1037 --- ChangeLog 22 Nov 2005 02:39:25 -0000 1.1038 *************** *** 1,4 **** --- 1,10 ---- 2005-11-21 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp + (proto_node::modified): Implemented "modified" virtual function. + Delegates to the first implementation node. + + 2005-11-21 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/vrml97node.cpp (appearance_node::do_render_appearance): Removed call to |
|
From: Braden M. <br...@us...> - 2005-11-21 06:40:20
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26642/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Removed call to this->node::modified(false). This is taken care of in openvrml::appearance_node::render_appearance. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** vrml97node.cpp 2 Nov 2005 08:50:24 -0000 1.83 --- vrml97node.cpp 21 Nov 2005 06:40:12 -0000 1.84 *************** *** 4705,4709 **** texture->render_texture(v); } - this->node::modified(false); } --- 4705,4708 ---- |
|
From: Braden M. <br...@us...> - 2005-11-21 06:40:19
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26642 Modified Files: ChangeLog Log Message: Removed call to this->node::modified(false). This is taken care of in openvrml::appearance_node::render_appearance. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1036 retrieving revision 1.1037 diff -C2 -d -r1.1036 -r1.1037 *** ChangeLog 21 Nov 2005 06:07:09 -0000 1.1036 --- ChangeLog 21 Nov 2005 06:40:12 -0000 1.1037 *************** *** 1,4 **** --- 1,11 ---- 2005-11-21 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/vrml97node.cpp + (appearance_node::do_render_appearance): Removed call to + this->node::modified(false). This is taken care of in + openvrml::appearance_node::render_appearance. + + 2005-11-21 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node.cpp: Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2005-11-21 06:07:20
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21842 Modified Files: ChangeLog Log Message: Doc-comment improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1035 retrieving revision 1.1036 diff -C2 -d -r1.1035 -r1.1036 *** ChangeLog 17 Nov 2005 21:51:14 -0000 1.1035 --- ChangeLog 21 Nov 2005 06:07:09 -0000 1.1036 *************** *** 1,2 **** --- 1,6 ---- + 2005-11-21 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/node.cpp: Doc-comment improvements. + 2005-11-14 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-21 06:07:20
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21842/src/libopenvrml/openvrml Modified Files: node.cpp Log Message: Doc-comment improvements. Index: node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** node.cpp 15 Nov 2005 00:30:21 -0000 1.66 --- node.cpp 21 Nov 2005 06:07:09 -0000 1.67 *************** *** 316,326 **** * @ingroup nodes * ! * @brief Determine if a node_interface matches an eventIn identifier. * * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * AdaptableBinaryPredicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a> */ --- 316,327 ---- * @ingroup nodes * ! * @brief Determine if a <code>node_interface</code> matches an eventIn ! * identifier. * * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * Adaptable Binary Predicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a> */ *************** *** 328,344 **** * @fn openvrml::node_interface_matches_eventin::result_type openvrml::node_interface_matches_eventin::operator()(const first_argument_type & interface, const second_argument_type & eventin_id) const * ! * @brief Determine if a node_interface matches an eventIn identifier. * * A node_interface matches an eventIn identifier if: ! * - the node_interface's @a type is node_interface::eventin_id and ! * - the node_interface's @a id is lexicographically equal to the eventIn ! * identifier ! * - or the node_interface's @a id is lexicographically equal to the eventIn ! * identifier with the string “set_” prepended. ! * - or, the node_interface's @a type is node_interface::exposedfield_id and ! * - the node_interface's @a id is lexicographically equal to the eventIn ! * identifier ! * - or the node_interface's @a id with the string “set_” ! * prepended is lexicographically equal to the eventIn identifier. * * @param interface node_interface. --- 329,349 ---- * @fn openvrml::node_interface_matches_eventin::result_type openvrml::node_interface_matches_eventin::operator()(const first_argument_type & interface, const second_argument_type & eventin_id) const * ! * @brief Determine if a <code>node_interface</code> matches an eventIn ! * identifier. * * A node_interface matches an eventIn identifier if: ! * - the <code>node_interface</code>'s @a type is node_interface::eventin_id ! * and ! * - the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventIn identifier ! * - or the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventIn identifier with the string “set_” prepended. ! * - or, the <code>node_interface</code>'s @a type is ! * <code>node_interface::exposedfield_id</code> and ! * - the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventIn identifier ! * - or the <code>node_interface</code>'s @a id with the string ! * “set_” prepended is lexicographically equal to the eventIn ! * identifier. * * @param interface node_interface. *************** *** 354,364 **** * @ingroup nodes * ! * @brief Determine if a node_interface matches an eventOut identifier. * * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * AdaptableBinaryPredicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a> */ --- 359,370 ---- * @ingroup nodes * ! * @brief Determine if a <code>node_interface</code> matches an eventOut ! * identifier. * * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * Adaptable Binary Predicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a> */ *************** *** 366,382 **** * @fn openvrml::node_interface_matches_eventout::result_type openvrml::node_interface_matches_eventout::operator()(const first_argument_type & interface, const second_argument_type & eventout_id) const * ! * @brief Determine if a node_interface matches an eventOut identifier. * ! * A node_interface matches an eventOut identifier if: ! * - the node_interface's @a type is node_interface::eventout_id and ! * - the node_interface's @a id is lexicographically equal to the eventOut ! * identifier ! * - or the node_interface's @a id is lexicographically equal to the eventOut ! * identifier with the string “_changed” appended. ! * - or, the node_interface's @a type is node_interface::exposedfield_id and ! * - the node_interface's @a id is lexicographically equal to the eventOut ! * identifier ! * - or the node_interface's @a id with the string “_changed” ! * appended is lexicographically equal to the eventOut identifier. * * @param interface node_interface. --- 372,392 ---- * @fn openvrml::node_interface_matches_eventout::result_type openvrml::node_interface_matches_eventout::operator()(const first_argument_type & interface, const second_argument_type & eventout_id) const * ! * @brief Determine if a <code>node_interface</code> matches an eventOut ! * identifier. * ! * A <code>node_interface</code> matches an eventOut identifier if: ! * - the <code>node_interface</code>'s @a type is ! * <code>node_interface::eventout_id</code> and ! * - the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventOut identifier ! * - or the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventOut identifier with the string “_changed” appended. ! * - or, the <code>node_interface</code>'s @a type is ! * <code>node_interface::exposedfield_id</code> and ! * - the <code>node_interface</code>'s @a id is lexicographically equal to ! * the eventOut identifier ! * - or the <code>node_interface</code>'s @a id with the string ! * “_changed” appended is lexicographically equal to the ! * eventOut identifier. * * @param interface node_interface. *************** *** 397,403 **** * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * AdaptableBinaryPredicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a> */ --- 407,413 ---- * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * Adaptable Binary Predicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a> */ *************** *** 405,409 **** * @fn openvrml::node_interface_matches_exposedfield::result_type openvrml::node_interface_matches_exposedfield::operator()(const first_argument_type & interface, const second_argument_type & exposedfield_id) const * ! * @brief Determine if a node_interface matches an exposedField identifier. * * A <code>node_interface</code> matches an exposedField identifier if the --- 415,420 ---- * @fn openvrml::node_interface_matches_exposedfield::result_type openvrml::node_interface_matches_exposedfield::operator()(const first_argument_type & interface, const second_argument_type & exposedfield_id) const * ! * @brief Determine if a <code>node_interface</code> matches an exposedField ! * identifier. * * A <code>node_interface</code> matches an exposedField identifier if the *************** *** 431,437 **** * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * AdaptableBinaryPredicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a> */ --- 442,448 ---- * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * Adaptable Binary Predicate</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a> */ *************** *** 439,447 **** * @fn openvrml::node_interface_matches_field::result_type openvrml::node_interface_matches_field::operator()(const first_argument_type & interface, const second_argument_type & field_id) const * ! * @brief Determine if a node_interface matches an field identifier. * ! * A node_interface matches a field identifier if the node_interface's @a type ! * is node_interface::field_id or node_interface::exposedfield_id and the ! * node_interface's @a id is lexicographically equal to the field identifier. * * @param interface node_interface. --- 450,462 ---- * @fn openvrml::node_interface_matches_field::result_type openvrml::node_interface_matches_field::operator()(const first_argument_type & interface, const second_argument_type & field_id) const * ! * @brief Determine if a <code>node_interface</code> matches an field ! * identifier. * ! * A <code>node_interface</code> matches a field identifier if the ! * <code>node_interface</code>'s @a type is ! * <code>node_interface::field_id</code> or ! * <code>node_interface::exposedfield_id</code> and the ! * <code>node_interface</code>'s @a id is lexicographically equal to the field ! * identifier. * * @param interface node_interface. *************** *** 462,471 **** * <code>node_interface_compare</code> provides a * <a href="http://www.sgi.com/tech/stl/StrictWeakOrdering.html"> ! * StrictWeakOrdering</a> for <code>node_interface</code>s and ensures that * exposedField definitions appropriately encroach on the namespace of eventIn * and eventOut definitions. That is, per 4.7 of the VRML97 spec: ”An ! * exposedField named zzz can be referred to as ‘set_zzz’ and ! * treated as an eventIn, and can be referred to as ‘zzz_changed’ ! * and treated as an eventOut.” * * <code>node_interface_compare</code> is the comparator used by --- 477,486 ---- * <code>node_interface_compare</code> provides a * <a href="http://www.sgi.com/tech/stl/StrictWeakOrdering.html"> ! * Strict Weak Ordering</a> for <code>node_interface</code>s and ensures that * exposedField definitions appropriately encroach on the namespace of eventIn * and eventOut definitions. That is, per 4.7 of the VRML97 spec: ”An ! * exposedField named ‘zzz@rsquo; can be referred to as ! * ‘set_zzz’ and treated as an eventIn, and can be referred to as ! * ‘zzz_changed’ and treated as an eventOut.” * * <code>node_interface_compare</code> is the comparator used by *************** *** 474,482 **** * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * AdaptableBinaryPredicate</a>, * <a href="http://www.sgi.com/tech/stl/StrictWeakOrdering.html"> ! * StrictWeakOrdering</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a> * * @see node_interface_set --- 489,497 ---- * @par Model of * <a href="http://www.sgi.com/tech/stl/AdaptableBinaryPredicate.html"> ! * Adaptable Binary Predicate</a>, * <a href="http://www.sgi.com/tech/stl/StrictWeakOrdering.html"> ! * Strict Weak Ordering</a>, * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a> * * @see node_interface_set |
|
From: Braden M. <br...@us...> - 2005-11-17 21:51:31
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22030 Modified Files: ChangeLog Log Message: Project file updates. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1034 retrieving revision 1.1035 diff -C2 -d -r1.1034 -r1.1035 *** ChangeLog 17 Nov 2005 21:36:49 -0000 1.1034 --- ChangeLog 17 Nov 2005 21:51:14 -0000 1.1035 *************** *** 1,4 **** --- 1,18 ---- 2005-11-14 Braden McDaniel <br...@en...> + Project file updates. + + * ide-projects/Windows/VisualC7_1/OpenVRML/OpenVRML.sln: Added + README, ChangeLog, etc. to solution. + * ide-projects/Windows/VisualC7_1/OpenVRML/antlr/antlr.vcproj: + * ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer/sdl-viewer.vcproj + * ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml/test-openvrml.vcproj: + Added file. + + + 2005-11-14 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node_impl_util.h (openvrml::node_impl_util::event_listener_base::event_listener_equal_to::operator()): |
|
From: Braden M. <br...@us...> - 2005-11-17 21:51:31
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22030/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer Modified Files: sdl-viewer.vcproj Log Message: Project file updates. Index: sdl-viewer.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sdl-viewer.vcproj 15 Nov 2005 02:36:41 -0000 1.2 --- sdl-viewer.vcproj 17 Nov 2005 21:51:14 -0000 1.3 *************** *** 25,29 **** MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" --- 25,29 ---- MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" *************** *** 89,92 **** --- 89,93 ---- <Tool Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" OutputFile="$(OutDir)/sdl-viewer.exe" LinkIncremental="1" |
|
From: Braden M. <br...@us...> - 2005-11-17 21:51:23
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22030/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Log Message: Project file updates. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openvrml-gl.vcproj 15 Nov 2005 02:36:41 -0000 1.4 --- openvrml-gl.vcproj 17 Nov 2005 21:51:14 -0000 1.5 *************** *** 25,29 **** MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" --- 25,29 ---- MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" |
|
From: Braden M. <br...@us...> - 2005-11-17 21:51:23
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22030/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml Modified Files: openvrml.vcproj Log Message: Project file updates. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** openvrml.vcproj 15 Nov 2005 02:36:41 -0000 1.9 --- openvrml.vcproj 17 Nov 2005 21:51:14 -0000 1.10 *************** *** 26,30 **** MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" --- 26,30 ---- MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" |
|
From: Braden M. <br...@us...> - 2005-11-17 21:51:23
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/antlr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22030/ide-projects/Windows/VisualC7_1/OpenVRML/antlr Modified Files: antlr.vcproj Log Message: Project file updates. Index: antlr.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/antlr/antlr.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** antlr.vcproj 15 Nov 2005 02:36:41 -0000 1.3 --- antlr.vcproj 17 Nov 2005 21:51:14 -0000 1.4 *************** *** 24,28 **** MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="2" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" --- 24,28 ---- MinimalRebuild="TRUE" BasicRuntimeChecks="0" ! RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" |
