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...> - 2006-03-08 20:06:39
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8826 Modified Files: ChangeLog Log Message: Removed OPENVRML_API macro from openvrml::node_cast<To>(node *). Microsoft cl 13.10.3077 doesn't like this in conjunction with inline. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1186 retrieving revision 1.1187 diff -C2 -d -r1.1186 -r1.1187 *** ChangeLog 7 Mar 2006 23:51:39 -0000 1.1186 --- ChangeLog 8 Mar 2006 20:06:34 -0000 1.1187 *************** *** 1,4 **** --- 1,11 ---- 2006-03-07 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node.h + (openvrml::node_cast<To>(node *)): Removed OPENVRML_API macro. + Microsoft cl 13.10.3077 doesn't like this in conjunction with + inline. + + 2006-03-07 Braden McDaniel <br...@en...> + Fixed to compile with Microsoft cl 13.10.3077. |
|
From: Braden M. <br...@us...> - 2006-03-08 20:06:38
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8826/src/libopenvrml/openvrml Modified Files: node.h Log Message: Removed OPENVRML_API macro from openvrml::node_cast<To>(node *). Microsoft cl 13.10.3077 doesn't like this in conjunction with inline. Index: node.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** node.h 7 Mar 2006 07:05:08 -0000 1.51 --- node.h 8 Mar 2006 20:06:34 -0000 1.52 *************** *** 294,298 **** template <typename To> ! OPENVRML_API To node_cast(node * n) OPENVRML_NOTHROW; class event_listener; --- 294,298 ---- template <typename To> ! To node_cast(node * n) OPENVRML_NOTHROW; class event_listener; *************** *** 307,311 **** friend class externproto_node; ! friend std::ostream & operator<<(std::ostream & out, const node & n); friend script_node * node_cast<script_node *>(node * n) --- 307,312 ---- friend class externproto_node; ! friend OPENVRML_API std::ostream & operator<<(std::ostream & out, ! const node & n); friend script_node * node_cast<script_node *>(node * n) *************** *** 625,630 **** template <> ! OPENVRML_API inline script_node * node_cast<script_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 626,630 ---- template <> ! inline script_node * node_cast<script_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 634,639 **** template <> ! OPENVRML_API inline appearance_node * ! node_cast<appearance_node *>(node * n) OPENVRML_NOTHROW { return n --- 634,639 ---- template <> ! inline appearance_node * node_cast<appearance_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 643,648 **** template <> ! OPENVRML_API inline bounded_volume_node * ! node_cast<bounded_volume_node *>(node * n) OPENVRML_NOTHROW { return n --- 643,648 ---- template <> ! inline bounded_volume_node * node_cast<bounded_volume_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 652,657 **** template <> ! OPENVRML_API inline child_node * node_cast<child_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 652,656 ---- template <> ! inline child_node * node_cast<child_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 661,666 **** template <> ! OPENVRML_API inline color_node * node_cast<color_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 660,664 ---- template <> ! inline color_node * node_cast<color_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 670,674 **** template <> ! OPENVRML_API inline color_rgba_node * node_cast<color_rgba_node *>(node * n) OPENVRML_NOTHROW { --- 668,672 ---- template <> ! inline color_rgba_node * node_cast<color_rgba_node *>(node * n) OPENVRML_NOTHROW { *************** *** 679,684 **** template <> ! OPENVRML_API inline coordinate_node * ! node_cast<coordinate_node *>(node * n) OPENVRML_NOTHROW { return n --- 677,682 ---- template <> ! inline coordinate_node * node_cast<coordinate_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 688,693 **** template <> ! OPENVRML_API inline font_style_node * ! node_cast<font_style_node *>(node * n) OPENVRML_NOTHROW { return n --- 686,691 ---- template <> ! inline font_style_node * node_cast<font_style_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 697,701 **** template <> ! OPENVRML_API inline geometry_node * node_cast<geometry_node *>(node * n) OPENVRML_NOTHROW { --- 695,699 ---- template <> ! inline geometry_node * node_cast<geometry_node *>(node * n) OPENVRML_NOTHROW { *************** *** 706,710 **** template <> ! OPENVRML_API inline grouping_node * node_cast<grouping_node *>(node * n) OPENVRML_NOTHROW { --- 704,708 ---- template <> ! inline grouping_node * node_cast<grouping_node *>(node * n) OPENVRML_NOTHROW { *************** *** 715,720 **** template <> ! OPENVRML_API inline light_node * node_cast<light_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 713,717 ---- template <> ! inline light_node * node_cast<light_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 724,728 **** template <> ! OPENVRML_API inline material_node * node_cast<material_node *>(node * n) OPENVRML_NOTHROW { --- 721,725 ---- template <> ! inline material_node * node_cast<material_node *>(node * n) OPENVRML_NOTHROW { *************** *** 733,738 **** template <> ! OPENVRML_API inline navigation_info_node * ! node_cast<navigation_info_node *>(node * n) OPENVRML_NOTHROW { --- 730,734 ---- template <> ! inline navigation_info_node * node_cast<navigation_info_node *>(node * n) OPENVRML_NOTHROW { *************** *** 743,748 **** template <> ! OPENVRML_API inline normal_node * node_cast<normal_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 739,743 ---- template <> ! inline normal_node * node_cast<normal_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 752,756 **** template <> ! OPENVRML_API inline pointing_device_sensor_node * node_cast<pointing_device_sensor_node *>(node * n) OPENVRML_NOTHROW { --- 747,751 ---- template <> ! inline pointing_device_sensor_node * node_cast<pointing_device_sensor_node *>(node * n) OPENVRML_NOTHROW { *************** *** 761,766 **** template <> ! OPENVRML_API inline scoped_light_node * ! node_cast<scoped_light_node *>(node * n) OPENVRML_NOTHROW { return n --- 756,761 ---- template <> ! inline scoped_light_node * node_cast<scoped_light_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 770,775 **** template <> ! OPENVRML_API inline sound_source_node * ! node_cast<sound_source_node *>(node * n) OPENVRML_NOTHROW { return n --- 765,770 ---- template <> ! inline sound_source_node * node_cast<sound_source_node *>(node * n) ! OPENVRML_NOTHROW { return n *************** *** 779,784 **** template <> ! OPENVRML_API inline texture_node * node_cast<texture_node *>(node * n) ! OPENVRML_NOTHROW { return n --- 774,778 ---- template <> ! inline texture_node * node_cast<texture_node *>(node * n) OPENVRML_NOTHROW { return n *************** *** 788,792 **** template <> ! OPENVRML_API inline texture_coordinate_node * node_cast<texture_coordinate_node *>(node * n) OPENVRML_NOTHROW { --- 782,786 ---- template <> ! inline texture_coordinate_node * node_cast<texture_coordinate_node *>(node * n) OPENVRML_NOTHROW { *************** *** 797,801 **** template <> ! OPENVRML_API inline texture_transform_node * node_cast<texture_transform_node *>(node * n) OPENVRML_NOTHROW { --- 791,795 ---- template <> ! inline texture_transform_node * node_cast<texture_transform_node *>(node * n) OPENVRML_NOTHROW { *************** *** 806,811 **** template <> ! OPENVRML_API inline time_dependent_node * ! node_cast<time_dependent_node *>(node * n) OPENVRML_NOTHROW { --- 800,804 ---- template <> ! inline time_dependent_node * node_cast<time_dependent_node *>(node * n) OPENVRML_NOTHROW { *************** *** 816,820 **** template <> ! OPENVRML_API inline transform_node * node_cast<transform_node *>(node * n) OPENVRML_NOTHROW { --- 809,813 ---- template <> ! inline transform_node * node_cast<transform_node *>(node * n) OPENVRML_NOTHROW { *************** *** 825,829 **** template <> ! OPENVRML_API inline viewpoint_node * node_cast<viewpoint_node *>(node * n) OPENVRML_NOTHROW { --- 818,822 ---- template <> ! inline viewpoint_node * node_cast<viewpoint_node *>(node * n) OPENVRML_NOTHROW { |
|
From: Braden M. <br...@us...> - 2006-03-07 23:51:43
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29516 Modified Files: ChangeLog Log Message: Fixes to compile with Microsoft cl 13.10.3077. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1185 retrieving revision 1.1186 diff -C2 -d -r1.1185 -r1.1186 *** ChangeLog 7 Mar 2006 07:05:08 -0000 1.1185 --- ChangeLog 7 Mar 2006 23:51:39 -0000 1.1186 *************** *** 1,4 **** --- 1,17 ---- 2006-03-07 Braden McDaniel <br...@en...> + Fixed to compile with Microsoft cl 13.10.3077. + + * src/libopenvrml/openvrml/browser.cpp + (openvrml::browser::current_time()): Only use _ftime_s with cl + 14.0 and later. + (parse_vrml(std::istream &, const std::string &, const + std::string&, openvrml::scene, + std::vector<boost::intrusive_ptr<openvrml::node> > &)): Removed + unnecessary use of function try block; cl 13.10.3077 doesn't like + it. + + 2006-03-07 Braden McDaniel <br...@en...> + Added openvrml::color_rgba_node abstract node type. *************** *** 71,75 **** (openvrml::scene::load(resource_istream &)): Delegate to parse_vrml. ! 2006-03-06 Braden McDaniel <br...@en...> --- 84,88 ---- (openvrml::scene::load(resource_istream &)): Delegate to parse_vrml. ! 2006-03-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-03-07 23:51:43
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29516/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Fixes to compile with Microsoft cl 13.10.3077. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** browser.cpp 7 Mar 2006 07:05:08 -0000 1.140 --- browser.cpp 7 Mar 2006 23:51:39 -0000 1.141 *************** *** 5592,5618 **** openvrml::scene & scene, std::vector<boost::intrusive_ptr<openvrml::node> > & nodes) ! try { ! using namespace openvrml; ! using boost::algorithm::iequals; ! if (iequals(type, vrml_media_type) ! || iequals(type, x_vrml_media_type)) { ! Vrml97Scanner scanner(in); ! Vrml97Parser parser(scanner, uri); ! parser.vrmlScene(scene, nodes); ! } else if (iequals(type, x3d_vrml_media_type)) { ! X3DVrmlScanner scanner(in); ! X3DVrmlParser parser(scanner, uri); ! parser.vrmlScene(scene, nodes); ! } else { ! throw bad_media_type(type); } - } catch (antlr::RecognitionException & ex) { - throw openvrml::invalid_vrml(ex.getFilename(), - ex.getLine(), - ex.getColumn(), - ex.getMessage()); - } catch (antlr::ANTLRException & ex) { - throw std::runtime_error(ex.getMessage()); } --- 5592,5620 ---- openvrml::scene & scene, std::vector<boost::intrusive_ptr<openvrml::node> > & nodes) ! { ! try { ! using namespace openvrml; ! using boost::algorithm::iequals; ! if (iequals(type, vrml_media_type) ! || iequals(type, x_vrml_media_type)) { ! Vrml97Scanner scanner(in); ! Vrml97Parser parser(scanner, uri); ! parser.vrmlScene(scene, nodes); ! } else if (iequals(type, x3d_vrml_media_type)) { ! X3DVrmlScanner scanner(in); ! X3DVrmlParser parser(scanner, uri); ! parser.vrmlScene(scene, nodes); ! } else { ! throw bad_media_type(type); ! } ! } catch (antlr::RecognitionException & ex) { ! throw openvrml::invalid_vrml(ex.getFilename(), ! ex.getLine(), ! ex.getColumn(), ! ex.getMessage()); ! } catch (antlr::ANTLRException & ex) { ! throw std::runtime_error(ex.getMessage()); } } *************** *** 7471,7481 **** double openvrml::browser::current_time() OPENVRML_NOTHROW { - double currentTime; # ifdef _WIN32 _timeb timebuffer; const errno_t err = _ftime_s(&timebuffer); assert(err == 0); ! currentTime = ! double(timebuffer.time) + 1.0e-3 * double(timebuffer.millitm); # else timeval tv; --- 7473,7485 ---- double openvrml::browser::current_time() OPENVRML_NOTHROW { # ifdef _WIN32 _timeb timebuffer; + # if defined(_MSC_VER) && (_MSC_VER < 1400) + _ftime(&timebuffer); + # else const errno_t err = _ftime_s(&timebuffer); assert(err == 0); ! # endif ! return double(timebuffer.time) + 1.0e-3 * double(timebuffer.millitm); # else timeval tv; *************** *** 7483,7489 **** assert(result == 0); ! currentTime = double(tv.tv_sec) + 1.0e-6 * double(tv.tv_usec); # endif - return currentTime; } --- 7487,7492 ---- assert(result == 0); ! return double(tv.tv_sec) + 1.0e-6 * double(tv.tv_usec); # endif } |
|
From: Braden M. <br...@us...> - 2006-03-07 07:05:13
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827 Modified Files: ChangeLog Log Message: Added openvrml::color_rgba_node abstract node type. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1184 retrieving revision 1.1185 diff -C2 -d -r1.1184 -r1.1185 *** ChangeLog 7 Mar 2006 04:21:05 -0000 1.1184 --- ChangeLog 7 Mar 2006 07:05:08 -0000 1.1185 *************** *** 1,2 **** --- 1,24 ---- + 2006-03-07 Braden McDaniel <br...@en...> + + Added openvrml::color_rgba_node abstract node type. + + * src/libopenvrml/openvrml/browser.cpp + (openvrml::proto_node): Added member function to_color_rgba. + (openvrml::externproto_node): Added member function to_color_rgba. + * src/libopenvrml/openvrml/node.cpp + (openvrml::node::to_color_rgba()): Added member function. + (openvrml::color_rgba_node::color_rgba_node(const node_type &, + const boost::shared_ptr<scope> &)): Added constructor. + (openvrml::color_rgba_node::~color_rgba_node()): Added destructor. + (openvrml::color_rgba_node::to_color_rgba()): Added member + function. + * src/libopenvrml/openvrml/node.h + (openvrml::node): Granted friendship to + node_cast<color_rgba_node*> specialization; added to_color_rgba + virtual member function. + (openvrml::node_cast<color_rgba_node *>(node *)): Added + specialization. + (openvrml::color_rgba_node): Added abstract node class. + 2006-03-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-03-07 07:05:12
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827/src/libopenvrml/openvrml Modified Files: browser.cpp node.cpp node.h Log Message: Added openvrml::color_rgba_node abstract node type. Index: node.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.h,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** node.h 5 Mar 2006 04:00:32 -0000 1.50 --- node.h 7 Mar 2006 07:05:08 -0000 1.51 *************** *** 271,274 **** --- 271,275 ---- class child_node; class color_node; + class color_rgba_node; class coordinate_node; class font_style_node; *************** *** 316,319 **** --- 317,322 ---- friend child_node * node_cast<child_node *>(node * n) OPENVRML_NOTHROW; friend color_node * node_cast<color_node *>(node * n) OPENVRML_NOTHROW; + friend color_rgba_node * node_cast<color_rgba_node *>(node * n) + OPENVRML_NOTHROW; friend coordinate_node * node_cast<coordinate_node *>(node * n) OPENVRML_NOTHROW; *************** *** 501,504 **** --- 504,508 ---- virtual child_node * to_child() OPENVRML_NOTHROW; virtual color_node * to_color() OPENVRML_NOTHROW; + virtual color_rgba_node * to_color_rgba() OPENVRML_NOTHROW; virtual coordinate_node * to_coordinate() OPENVRML_NOTHROW; virtual font_style_node * to_font_style() OPENVRML_NOTHROW ; *************** *** 666,669 **** --- 670,682 ---- template <> + OPENVRML_API inline color_rgba_node * node_cast<color_rgba_node *>(node * n) + OPENVRML_NOTHROW + { + return n + ? n->to_color_rgba() + : 0; + } + + template <> OPENVRML_API inline coordinate_node * node_cast<coordinate_node *>(node * n) OPENVRML_NOTHROW *************** *** 908,911 **** --- 921,941 ---- + class OPENVRML_API color_rgba_node : public virtual node { + public: + virtual ~color_rgba_node() OPENVRML_NOTHROW = 0; + + virtual const std::vector<openvrml::color_rgba> & color_rgba() const + OPENVRML_NOTHROW = 0; + + protected: + color_rgba_node(const node_type & type, + const boost::shared_ptr<openvrml::scope> & scope) + OPENVRML_NOTHROW; + + private: + virtual color_rgba_node * to_color_rgba() OPENVRML_NOTHROW; + }; + + class OPENVRML_API coordinate_node : public virtual node { public: Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** browser.cpp 6 Mar 2006 08:03:17 -0000 1.139 --- browser.cpp 7 Mar 2006 07:05:08 -0000 1.140 *************** *** 529,532 **** --- 529,533 ---- virtual child_node * to_child() OPENVRML_NOTHROW; virtual color_node * to_color() OPENVRML_NOTHROW; + virtual color_rgba_node * to_color_rgba() OPENVRML_NOTHROW; virtual coordinate_node * to_coordinate() OPENVRML_NOTHROW; virtual font_style_node * to_font_style() OPENVRML_NOTHROW ; *************** *** 1988,1991 **** --- 1989,2005 ---- /** + * @brief Cast to a @c color_rgba_node. + * + * @return a pointer to the first node in the implementation if that node + * is a @c color_rgba_node, or 0 otherwise. + */ + color_rgba_node * proto_node::to_color_rgba() OPENVRML_NOTHROW + { + assert(!this->impl_nodes.empty()); + assert(this->impl_nodes[0]); + return node_cast<color_rgba_node *>(this->impl_nodes[0].get()); + } + + /** * @brief Cast to a coordinate_node. * *************** *** 2457,2460 **** --- 2471,2475 ---- virtual openvrml::child_node * to_child() OPENVRML_NOTHROW; virtual openvrml::color_node * to_color() OPENVRML_NOTHROW; + virtual openvrml::color_rgba_node * to_color_rgba() OPENVRML_NOTHROW; virtual openvrml::coordinate_node * to_coordinate() OPENVRML_NOTHROW; virtual openvrml::font_style_node * to_font_style() OPENVRML_NOTHROW ; *************** *** 6222,6225 **** --- 6237,6252 ---- /** + * @brief Cast to a @c color_rgba_node. + * + * @return a pointer to the first node in the implementation if that node + * is a @c color_rgba_node, or 0 otherwise. + */ + openvrml::color_rgba_node * openvrml::externproto_node::to_color_rgba() + OPENVRML_NOTHROW + { + return node_cast<color_rgba_node *>(this->proto_node_.get()); + } + + /** * @brief Cast to a coordinate_node. * Index: node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** node.cpp 5 Mar 2006 04:00:32 -0000 1.76 --- node.cpp 7 Mar 2006 07:05:08 -0000 1.77 *************** *** 1003,1006 **** --- 1003,1012 ---- /** + * @fn openvrml::color_rgba_node * openvrml::node::node_cast<color_rgba_node *>(node * n) + * + * @brief Cast to a <code>color_rgba_node</code>. + */ + + /** * @fn openvrml::coordinate_node * openvrml::node::node_cast<coordinate_node *>(node * n) * *************** *** 2049,2052 **** --- 2055,2072 ---- * @internal * + * @brief Cast to a @c color_rgba_node. + * + * Default implementation returns 0. + * + * @return 0 + */ + openvrml::color_rgba_node * openvrml::node::to_color_rgba() OPENVRML_NOTHROW + { + return 0; + } + + /** + * @internal + * * @brief Cast to a coordinate_node. * *************** *** 2698,2701 **** --- 2718,2732 ---- /** + * @fn template <> openvrml::color_rgba_node * openvrml::node_cast<openvrml::color_rgba_node *>(node * n) + * + * @brief Cast to a @c color_rgba_node. + * + * @param[in] n node. + * + * @return a @c color_rgba_node pointer to the node pointed to by @p n, or 0 if the + * node is not a @c color_rgba_node. + */ + + /** * @fn template <> openvrml::coordinate_node * openvrml::node_cast<openvrml::coordinate_node *>(node * n) * *************** *** 3218,3221 **** --- 3249,3299 ---- /** + * @class openvrml::color_rgba_node + * + * @ingroup nodes + * + * @brief Abstract base class for RGBA color nodes. + */ + + /** + * @brief Construct. + * + * @param[in] type the node_type associated with the node. + * @param[in] scope the scope the node belongs to. + */ + openvrml::color_rgba_node:: + color_rgba_node(const node_type & type, + const boost::shared_ptr<openvrml::scope> & scope) + OPENVRML_NOTHROW: + node(type, scope) + {} + + /** + * @brief Destroy. + */ + openvrml::color_rgba_node::~color_rgba_node() OPENVRML_NOTHROW + {} + + /** + * @brief Cast to a @c color_rgba_node. + * + * @return a pointer to this @c color_rgba_node. + */ + openvrml::color_rgba_node * + openvrml::color_rgba_node::to_color_rgba() OPENVRML_NOTHROW + { + return this; + } + + /** + * @fn const std::vector<openvrml::color_rgba> & openvrml::color_rgba_node::color() const + * + * @brief Get the @c color_rgba array encapsulated by this node. + * + * @return the @c color_rgba array for this node. + */ + + + /** * @class openvrml::coordinate_node * |
|
From: Braden M. <br...@us...> - 2006-03-07 04:21:09
|
Update of /cvsroot/openvrml/openvrml/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3745/tests Modified Files: browser.cpp test_browser.cpp Log Message: Identify model/vrml, model/x3d+vrml, image/png, and image/jpeg based on the file name extension in test_browser. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/browser.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** browser.cpp 27 Feb 2006 21:14:08 -0000 1.5 --- browser.cpp 7 Mar 2006 04:21:05 -0000 1.6 *************** *** 95,99 **** boost::mutex::scoped_lock lock(mutex); while (!listener.received_event()) { ! listener_received_event.wait(lock); } } --- 95,104 ---- boost::mutex::scoped_lock lock(mutex); while (!listener.received_event()) { ! boost::xtime xt; ! boost::xtime_get(&xt, boost::TIME_UTC); ! xt.sec += 1; ! const bool succeeded = ! listener_received_event.timed_wait(lock, xt); ! BOOST_REQUIRE(succeeded); } } Index: test_browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/test_browser.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_browser.cpp 27 Feb 2006 21:14:08 -0000 1.4 --- test_browser.cpp 7 Mar 2006 04:21:05 -0000 1.5 *************** *** 20,23 **** --- 20,24 ---- # include <iostream> # include <fstream> + # include <boost/algorithm/string/predicate.hpp> # include "test_browser.h" *************** *** 42,46 **** resource_istream(&this->buf_) { ! this->buf_.open(path.c_str(), ios_base::in); } --- 43,49 ---- resource_istream(&this->buf_) { ! if (!this->buf_.open(path.c_str(), ios_base::in)) { ! this->setstate(ios_base::failbit); ! } } *************** *** 58,62 **** virtual const std::string do_type() const throw () { ! return "application/octet-stream"; } --- 61,88 ---- virtual const std::string do_type() const throw () { ! using std::find; ! using std::string; ! using boost::algorithm::iequals; ! using boost::next; ! string media_type = "application/octet-stream"; ! const string::const_reverse_iterator dot_pos = ! find(this->url_.rbegin(), this->url_.rend(), '.'); ! if (dot_pos == this->url_.rend() ! || next(dot_pos.base()) == this->url_.end()) { ! return media_type; ! } ! const string::const_iterator hash_pos = ! find(next(dot_pos.base()), this->url_.end(), '#'); ! const string ext(dot_pos.base(), hash_pos); ! if (iequals(ext, "wrl")) { ! media_type = "model/vrml"; ! } else if (iequals(ext, "x3dv")) { ! media_type = "model/x3d+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; } |
|
From: Braden M. <br...@us...> - 2006-03-07 04:21:09
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3745 Modified Files: ChangeLog Log Message: Identify model/vrml, model/x3d+vrml, image/png, and image/jpeg based on the file name extension in test_browser. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1183 retrieving revision 1.1184 diff -C2 -d -r1.1183 -r1.1184 *** ChangeLog 6 Mar 2006 19:26:33 -0000 1.1183 --- ChangeLog 7 Mar 2006 04:21:05 -0000 1.1184 *************** *** 1,4 **** --- 1,20 ---- 2006-03-06 Braden McDaniel <br...@en...> + Identify model/vrml, model/x3d+vrml, image/png, and image/jpeg + based on the file name extension in test_browser. + + * tests/browser.cpp (create_vrml_from_url()): Use a + boost::condition::timed_wait so that the test times out on failure + rather than hanging. + * tests/test_browser.cpp (test_browser::do_get_resource(const + std::string &)::file_resource_istream::file_resource_istream(const + std::string &)): Set the failbit if opening the file fails. + (test_browser::do_get_resource(const + std::string&)::file_resource_istream::do_type() const): Identify + model/vrml, model/x3d+vrml, image/png, and image/jpeg based on the + file name extension. + + 2006-03-06 Braden McDaniel <br...@en...> + * examples/sdl_viewer.cpp (browser::do_get_resource(const |
|
From: Braden M. <br...@us...> - 2006-03-06 19:26:38
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20582 Modified Files: ChangeLog Log Message: Apply "model/x3d+vrml" to files with the "x3dv" extension. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1182 retrieving revision 1.1183 diff -C2 -d -r1.1182 -r1.1183 *** ChangeLog 6 Mar 2006 08:03:16 -0000 1.1182 --- ChangeLog 6 Mar 2006 19:26:33 -0000 1.1183 *************** *** 1,4 **** --- 1,11 ---- 2006-03-06 Braden McDaniel <br...@en...> + * examples/sdl_viewer.cpp + (browser::do_get_resource(const + std::string&)::file_resource_istream::do_type() const): Apply + "model/x3d+vrml" to files with the "x3dv" extension. + + 2006-03-06 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp (openvrml::browser::vrml_from_url_creator::operator()() const): |
|
From: Braden M. <br...@us...> - 2006-03-06 19:26:36
|
Update of /cvsroot/openvrml/openvrml/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20582/examples Modified Files: sdl_viewer.cpp Log Message: Apply "model/x3d+vrml" to files with the "x3dv" extension. Index: sdl_viewer.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/examples/sdl_viewer.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sdl_viewer.cpp 7 Jan 2006 23:37:01 -0000 1.9 --- sdl_viewer.cpp 6 Mar 2006 19:26:33 -0000 1.10 *************** *** 173,176 **** --- 173,178 ---- if (iequals(ext, "wrl")) { media_type = "model/vrml"; + } else if (iequals(ext, "x3dv")) { + media_type = "model/x3d+vrml"; } else if (iequals(ext, "png")) { media_type = "image/png"; |
|
From: Braden M. <br...@us...> - 2006-03-06 08:03:22
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15440/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Pass the stream type to browser::create_from_from_stream. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** browser.cpp 6 Mar 2006 07:15:58 -0000 1.138 --- browser.cpp 6 Mar 2006 08:03:17 -0000 1.139 *************** *** 8244,8248 **** {} ! void operator()() const OPENVRML_NOTHROW try { try { std::auto_ptr<resource_istream> in = --- 8244,8249 ---- {} ! void operator()() const OPENVRML_NOTHROW ! try { try { std::auto_ptr<resource_istream> in = *************** *** 8250,8254 **** if (!(*in)) { throw unreachable_url(); } mfnode nodes; ! nodes.value(this->browser_->create_vrml_from_stream(*in)); this->listener_->process_event(nodes, browser::current_time()); } catch (std::exception & ex) { --- 8251,8255 ---- if (!(*in)) { throw unreachable_url(); } mfnode nodes; ! nodes.value(this->browser_->create_vrml_from_stream(*in, in->type())); this->listener_->process_event(nodes, browser::current_time()); } catch (std::exception & ex) { |
|
From: Braden M. <br...@us...> - 2006-03-06 08:03:20
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15440 Modified Files: ChangeLog Log Message: Pass the stream type to browser::create_from_from_stream. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1181 retrieving revision 1.1182 diff -C2 -d -r1.1181 -r1.1182 *** ChangeLog 6 Mar 2006 07:15:58 -0000 1.1181 --- ChangeLog 6 Mar 2006 08:03:16 -0000 1.1182 *************** *** 1,4 **** --- 1,10 ---- 2006-03-06 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp + (openvrml::browser::vrml_from_url_creator::operator()() const): + Pass the stream type to browser::create_from_from_stream. + + 2006-03-06 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Removed obsolete doc-comments. |
|
From: Braden M. <br...@us...> - 2006-03-06 07:16:05
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27276 Modified Files: ChangeLog Log Message: Removed obsolete doc-comments. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1180 retrieving revision 1.1181 diff -C2 -d -r1.1180 -r1.1181 *** ChangeLog 6 Mar 2006 06:59:46 -0000 1.1180 --- ChangeLog 6 Mar 2006 07:15:58 -0000 1.1181 *************** *** 1,4 **** --- 1,9 ---- 2006-03-06 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp: Removed obsolete + doc-comments. + + 2006-03-06 Braden McDaniel <br...@en...> + Consolidate logic for picking a parser. |
|
From: Braden M. <br...@us...> - 2006-03-06 07:16:05
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27276/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Removed obsolete doc-comments. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** browser.cpp 6 Mar 2006 06:59:46 -0000 1.137 --- browser.cpp 6 Mar 2006 07:15:58 -0000 1.138 *************** *** 6442,6469 **** /** - * @var const double openvrml::pi - * - * @brief pi - */ - - /** - * @var const double openvrml::pi_2 - * - * @brief pi/2 - */ - - /** - * @var const double openvrml::pi_4 - * - * @brief pi/4 - */ - - /** - * @var const double openvrml::inv_pi - * - * @brief 1/pi - */ - - /** * @brief VRML MIME media type. */ --- 6442,6445 ---- |
|
From: Braden M. <br...@us...> - 2006-03-06 06:59:49
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20537/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Consolidate logic for picking a parser. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** browser.cpp 6 Mar 2006 05:58:22 -0000 1.136 --- browser.cpp 6 Mar 2006 06:59:46 -0000 1.137 *************** *** 5559,5562 **** --- 5559,5605 ---- namespace { + /** + * @brief Parse a VRML stream. + * + * @param[in,out] in input stream. + * @param[in] uri URI associated with @p in. + * @param[in] type MIME media type of the data to be read from @p in. + * @param[in,out] scene a scene. + * @param[out] nodes the root nodes. + * + * @exception openvrml::bad_media_type + * @exception openvrml::invalid_vrml + */ + OPENVRML_LOCAL void + parse_vrml(std::istream & in, + const std::string & uri, + const std::string & type, + openvrml::scene & scene, + std::vector<boost::intrusive_ptr<openvrml::node> > & nodes) + try { + using namespace openvrml; + using boost::algorithm::iequals; + + if (iequals(type, vrml_media_type) + || iequals(type, x_vrml_media_type)) { + Vrml97Scanner scanner(in); + Vrml97Parser parser(scanner, uri); + parser.vrmlScene(scene, nodes); + } else if (iequals(type, x3d_vrml_media_type)) { + X3DVrmlScanner scanner(in); + X3DVrmlParser parser(scanner, uri); + parser.vrmlScene(scene, nodes); + } else { + throw bad_media_type(type); + } + } catch (antlr::RecognitionException & ex) { + throw openvrml::invalid_vrml(ex.getFilename(), + ex.getLine(), + ex.getColumn(), + ex.getMessage()); + } catch (antlr::ANTLRException & ex) { + throw std::runtime_error(ex.getMessage()); + } + struct OPENVRML_LOCAL externproto_node_class::load_proto { load_proto(externproto_node_class & externproto_class, *************** *** 5576,5580 **** using std::string; using std::vector; - using boost::algorithm::iequals; using boost::dynamic_pointer_cast; using boost::shared_ptr; --- 5619,5622 ---- *************** *** 5598,5613 **** std::vector<boost::intrusive_ptr<node> > nodes; ! if (iequals(in->type(), vrml_media_type) ! || iequals(in->type(), x_vrml_media_type)) { ! Vrml97Scanner scanner(*in); ! Vrml97Parser parser(scanner, in->url()); ! parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(in->type(), x3d_vrml_media_type)) { ! X3DVrmlScanner scanner(*in); ! X3DVrmlParser parser(scanner, in->url()); ! parser.vrmlScene(*this->scene_, nodes); ! } else { ! throw bad_media_type(in->type()); ! } shared_ptr<openvrml::proto_node_class> proto_node_class; --- 5640,5644 ---- std::vector<boost::intrusive_ptr<node> > nodes; ! parse_vrml(*in, in->url(), in->type(), *this->scene_, nodes); shared_ptr<openvrml::proto_node_class> proto_node_class; *************** *** 8216,8243 **** std::vector<boost::intrusive_ptr<node> > nodes; try { - using boost::algorithm::iequals; - assert(this->scene_); ! ! if (iequals(type, vrml_media_type) ! || iequals(type, x_vrml_media_type)) { ! Vrml97Scanner scanner(in); ! Vrml97Parser parser(scanner, stream_id); ! parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(type, x3d_vrml_media_type)) { ! X3DVrmlScanner scanner(in); ! X3DVrmlParser parser(scanner, stream_id); ! parser.vrmlScene(*this->scene_, nodes); ! } else { ! throw std::invalid_argument("unrecognized content type \"" ! + type + "\""); ! } ! } catch (antlr::RecognitionException & ex) { ! throw invalid_vrml(ex.getFilename(), ! ex.getLine(), ! ex.getColumn(), ! ex.getMessage()); ! } catch (antlr::ANTLRException & ex) { ! throw std::runtime_error(ex.getMessage()); } return nodes; --- 8247,8254 ---- std::vector<boost::intrusive_ptr<node> > nodes; try { assert(this->scene_); ! parse_vrml(in, stream_id, type, *this->scene_, nodes); ! } catch (openvrml::bad_media_type & ex) { ! throw std::invalid_argument(ex.what()); } return nodes; *************** *** 9056,9082 **** boost::mutex::scoped_lock url_lock(this->url_mutex_); ! try { ! using boost::algorithm::iequals; ! ! this->url_ = in.url(); ! ! if (iequals(in.type(), vrml_media_type) ! || iequals(in.type(), x_vrml_media_type)) { ! Vrml97Scanner scanner(in); ! Vrml97Parser parser(scanner, this->url_); ! parser.vrmlScene(*this, this->nodes_); ! } else if (iequals(in.type(), x3d_vrml_media_type)) { ! X3DVrmlScanner scanner(in); ! X3DVrmlParser parser(scanner, this->url_); ! parser.vrmlScene(*this, this->nodes_); ! } else { ! throw bad_media_type(in.type()); ! } ! } catch (antlr::RecognitionException & ex) { ! throw invalid_vrml(ex.getFilename(), ! ex.getLine(), ! ex.getColumn(), ! ex.getMessage()); ! } } --- 9067,9072 ---- boost::mutex::scoped_lock url_lock(this->url_mutex_); ! this->url_ = in.url(); ! parse_vrml(in, in.url(), in.type(), *this, this->nodes_); } |
|
From: Braden M. <br...@us...> - 2006-03-06 06:59:48
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20537 Modified Files: ChangeLog Log Message: Consolidate logic for picking a parser. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1179 retrieving revision 1.1180 diff -C2 -d -r1.1179 -r1.1180 *** ChangeLog 6 Mar 2006 05:58:22 -0000 1.1179 --- ChangeLog 6 Mar 2006 06:59:46 -0000 1.1180 *************** *** 1,4 **** --- 1,21 ---- 2006-03-06 Braden McDaniel <br...@en...> + Consolidate logic for picking a parser. + + * src/libopenvrml/openvrml/browser.cpp + (parse_vrml(std::istream &, const std::string &, const + std::string&, openvrml::scene, + std::vector<boost::intrusive_ptr<openvrml::node> > &)): Added + function; this consolidates the logic for picking the VRML97 or + X3D-VRML parser. + (externproto_node_class::load_proto::operator()() const): Delegate + to parse_vrml. + (openvrml::browser::create_vrml_from_stream(std::istream &, const + std::string &)): Delegate to parse_vrml. + (openvrml::scene::load(resource_istream &)): Delegate to + parse_vrml. + + 2006-03-06 Braden McDaniel <br...@en...> + Expose constants for the VRML and X3D VRML MIME media types. |
|
From: Braden M. <br...@us...> - 2006-03-06 05:58:56
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29276 Modified Files: ChangeLog Log Message: Expose constants for the VRML and X3D VRML MIME media types. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1178 retrieving revision 1.1179 diff -C2 -d -r1.1178 -r1.1179 *** ChangeLog 6 Mar 2006 04:24:39 -0000 1.1178 --- ChangeLog 6 Mar 2006 05:58:22 -0000 1.1179 *************** *** 1,2 **** --- 1,26 ---- + 2006-03-06 Braden McDaniel <br...@en...> + + Expose constants for the VRML and X3D VRML MIME media types. + + * src/libopenvrml/openvrml/browser.cpp + (openvrml::vrml_media_type): Added definition. + (openvrml::x_vrml_media_type): Added definition. + (openvrml::x3d_vrml_media_type): Added definition. + (externproto_node_class::load_proto::operator()() const): Use + vrml_media_type, x_vrml_media_type, and x3d_vrml_media_type + instead of string literals. + (openvrml::browser::create_vrml_from_stream(std::istream &, const + std::string &)): Use vrml_media_type, x_vrml_media_type, and + x3d_vrml_media_type instead of string literals. + (openvrml::scene::load(resource_istream &)): Use vrml_media_type, + x_vrml_media_type, and x3d_vrml_media_type instead of string + literals. + * src/libopenvrml/openvrml/browser.h + (openvrml::vrml_media_type): Added declaration. + (openvrml::x_vrml_media_type): Added declaration. + (openvrml::x3d_vrml_media_type): Added declaration. + * tests/parse_vrml97.cpp: Use openvrml::vrml_media_type. + * tests/parse_x3dvrml.cpp: Use openvrml::x3d_vrml_media_type. + 2006-03-05 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-03-06 05:58:30
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29276/src/libopenvrml/openvrml Modified Files: browser.cpp browser.h Log Message: Expose constants for the VRML and X3D VRML MIME media types. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** browser.cpp 5 Mar 2006 04:00:31 -0000 1.135 --- browser.cpp 6 Mar 2006 05:58:22 -0000 1.136 *************** *** 5572,5575 **** --- 5572,5576 ---- using openvrml::unreachable_url; try { + using namespace openvrml; using std::auto_ptr; using std::string; *************** *** 5578,5583 **** using boost::dynamic_pointer_cast; using boost::shared_ptr; - using openvrml::resource_istream; - using openvrml::node_class_id; using openvrml_::scope_guard; using openvrml_::make_obj_guard; --- 5579,5582 ---- *************** *** 5597,5613 **** // wants it. // ! std::vector<boost::intrusive_ptr<openvrml::node> > nodes; ! if (iequals(in->type(), "model/vrml") ! || iequals(in->type(), "x-world/x-vrml")) { Vrml97Scanner scanner(*in); ! openvrml::Vrml97Parser parser(scanner, in->url()); parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(in->type(), "model/x3d+vrml")) { X3DVrmlScanner scanner(*in); ! openvrml::X3DVrmlParser parser(scanner, in->url()); parser.vrmlScene(*this->scene_, nodes); } else { ! throw openvrml::bad_media_type(in->type()); } --- 5596,5612 ---- // wants it. // ! std::vector<boost::intrusive_ptr<node> > nodes; ! if (iequals(in->type(), vrml_media_type) ! || iequals(in->type(), x_vrml_media_type)) { Vrml97Scanner scanner(*in); ! Vrml97Parser parser(scanner, in->url()); parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(in->type(), x3d_vrml_media_type)) { X3DVrmlScanner scanner(*in); ! X3DVrmlParser parser(scanner, in->url()); parser.vrmlScene(*this->scene_, nodes); } else { ! throw bad_media_type(in->type()); } *************** *** 6436,6439 **** --- 6435,6453 ---- /** + * @brief VRML MIME media type. + */ + const char openvrml::vrml_media_type[11] = "model/vrml"; + + /** + * @brief Experimental VRML MIME media type. + */ + const char openvrml::x_vrml_media_type[15] = "x-world/x-vrml"; + + /** + * @brief X3D VRML MIME media type. + */ + const char openvrml::x3d_vrml_media_type[15] = "model/x3d+vrml"; + + /** * @class openvrml::resource_istream * *************** *** 8206,8215 **** assert(this->scene_); ! if (iequals(type, "model/vrml") ! || iequals(type, "x-world/x-vrml")) { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(type, "model/x3d+vrml")) { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, stream_id); --- 8220,8229 ---- assert(this->scene_); ! if (iequals(type, vrml_media_type) ! || iequals(type, x_vrml_media_type)) { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, stream_id); parser.vrmlScene(*this->scene_, nodes); ! } else if (iequals(type, x3d_vrml_media_type)) { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, stream_id); *************** *** 9047,9056 **** this->url_ = in.url(); ! if (iequals(in.type(), "model/vrml") ! || iequals(in.type(), "x-world/x-vrml")) { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, this->url_); parser.vrmlScene(*this, this->nodes_); ! } else if (iequals(in.type(), "model/x3d+vrml")) { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, this->url_); --- 9061,9070 ---- this->url_ = in.url(); ! if (iequals(in.type(), vrml_media_type) ! || iequals(in.type(), x_vrml_media_type)) { Vrml97Scanner scanner(in); Vrml97Parser parser(scanner, this->url_); parser.vrmlScene(*this, this->nodes_); ! } else if (iequals(in.type(), x3d_vrml_media_type)) { X3DVrmlScanner scanner(in); X3DVrmlParser parser(scanner, this->url_); Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** browser.h 5 Mar 2006 04:00:31 -0000 1.47 --- browser.h 6 Mar 2006 05:58:26 -0000 1.48 *************** *** 28,31 **** --- 28,35 ---- namespace openvrml { + OPENVRML_API extern const char vrml_media_type[11]; + OPENVRML_API extern const char x_vrml_media_type[15]; + OPENVRML_API extern const char x3d_vrml_media_type[15]; + class OPENVRML_API resource_istream : public std::istream { public: *************** *** 295,299 **** const std::vector<boost::intrusive_ptr<node> > create_vrml_from_stream(std::istream & in, ! const std::string & type = "model/vrml"); void create_vrml_from_url(const std::vector<std::string> & url, const boost::intrusive_ptr<node> & node, --- 299,303 ---- const std::vector<boost::intrusive_ptr<node> > create_vrml_from_stream(std::istream & in, ! const std::string & type = vrml_media_type); void create_vrml_from_url(const std::vector<std::string> & url, const boost::intrusive_ptr<node> & node, |
|
From: Braden M. <br...@us...> - 2006-03-06 05:58:29
|
Update of /cvsroot/openvrml/openvrml/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29276/tests Modified Files: parse_vrml97.cpp parse_x3dvrml.cpp Log Message: Expose constants for the VRML and X3D VRML MIME media types. Index: parse_vrml97.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/parse_vrml97.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parse_vrml97.cpp 5 Mar 2006 06:25:12 -0000 1.1 --- parse_vrml97.cpp 6 Mar 2006 05:58:26 -0000 1.2 *************** *** 28,32 **** try { test_browser b; ! b.create_vrml_from_stream(cin, "model/vrml"); } catch (invalid_vrml & ex) { cerr << ex.url << ':' << ex.line << ':' << ex.column << ": error: " --- 28,32 ---- try { test_browser b; ! b.create_vrml_from_stream(cin, vrml_media_type); } catch (invalid_vrml & ex) { cerr << ex.url << ':' << ex.line << ':' << ex.column << ": error: " Index: parse_x3dvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/parse_x3dvrml.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parse_x3dvrml.cpp 5 Mar 2006 06:25:12 -0000 1.1 --- parse_x3dvrml.cpp 6 Mar 2006 05:58:26 -0000 1.2 *************** *** 28,32 **** try { test_browser b; ! b.create_vrml_from_stream(cin, "model/x3d+vrml"); } catch (invalid_vrml & ex) { cerr << ex.url << ':' << ex.line << ':' << ex.column << ": error: " --- 28,32 ---- try { test_browser b; ! b.create_vrml_from_stream(cin, x3d_vrml_media_type); } catch (invalid_vrml & ex) { cerr << ex.url << ':' << ex.line << ':' << ex.column << ": error: " |
|
From: Braden M. <br...@us...> - 2006-03-06 04:24:42
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26003/doc Modified Files: Doxyfile Log Message: Set EXAMPLE_PATH. Index: Doxyfile =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/Doxyfile,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Doxyfile 12 Feb 2006 09:40:17 -0000 1.21 --- Doxyfile 6 Mar 2006 04:24:39 -0000 1.22 *************** *** 87,91 **** X3DVrmlParser.* \ X3DVrmlParserTokenTypes.hpp ! EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO --- 87,91 ---- X3DVrmlParser.* \ X3DVrmlParserTokenTypes.hpp ! EXAMPLE_PATH = ../examples EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO |
|
From: Braden M. <br...@us...> - 2006-03-06 04:24:42
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26003 Modified Files: ChangeLog Log Message: Set EXAMPLE_PATH. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1177 retrieving revision 1.1178 diff -C2 -d -r1.1177 -r1.1178 *** ChangeLog 6 Mar 2006 04:23:19 -0000 1.1177 --- ChangeLog 6 Mar 2006 04:24:39 -0000 1.1178 *************** *** 1,4 **** --- 1,8 ---- 2006-03-05 Braden McDaniel <br...@en...> + * doc/Doxyfile: Set EXAMPLE_PATH. + + 2006-03-05 Braden McDaniel <br...@en...> + * doc/doxygen-header: Improved appearance of tables. |
|
From: Braden M. <br...@us...> - 2006-03-06 04:23:22
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25506 Modified Files: ChangeLog Log Message: Improved appearance of tables. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1176 retrieving revision 1.1177 diff -C2 -d -r1.1176 -r1.1177 *** ChangeLog 6 Mar 2006 04:21:46 -0000 1.1176 --- ChangeLog 6 Mar 2006 04:23:19 -0000 1.1177 *************** *** 1,4 **** --- 1,8 ---- 2006-03-05 Braden McDaniel <br...@en...> + * doc/doxygen-header: Improved appearance of tables. + + 2006-03-05 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/field_value.cpp: Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2006-03-06 04:23:22
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25506/doc Modified Files: doxygen-header Log Message: Improved appearance of tables. Index: doxygen-header =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/doxygen-header,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** doxygen-header 25 Feb 2006 06:57:28 -0000 1.19 --- doxygen-header 6 Mar 2006 04:23:19 -0000 1.20 *************** *** 190,193 **** --- 190,198 ---- color: black; } + + table { + border-collapse: collapse; + border-spacing: 0; + } </style> </head> |
|
From: Braden M. <br...@us...> - 2006-03-06 04:21:51
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710/src/libopenvrml/openvrml Modified Files: field_value.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.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** field_value.cpp 6 Mar 2006 03:46:41 -0000 1.25 --- field_value.cpp 6 Mar 2006 04:21:48 -0000 1.26 *************** *** 58,61 **** --- 58,64 ---- * * @brief Abstract base class for the VRML field types. + * + * Subclasses of @c field_value are models of @link FieldValueConcept + * Field Value@endlink. These subclasses have copy-on-write semantics. */ *************** *** 229,232 **** --- 232,241 ---- /** + * @var openvrml::field_value::sfdouble_id + * + * @brief Designates an @c sfdouble. + */ + + /** * @var openvrml::field_value::sfimage_id * *************** *** 271,274 **** --- 280,289 ---- /** + * @var openvrml::field_value::sfvec2d_id + * + * @brief Designates an @c sfvec2d. + */ + + /** * @var openvrml::field_value::sfvec3f_id * *************** *** 277,280 **** --- 292,301 ---- /** + * @var openvrml::field_value::sfvec3d_id + * + * @brief Designates an @c sfvec3d. + */ + + /** * @var openvrml::field_value::mfbool_id * *************** *** 301,304 **** --- 322,331 ---- /** + * @var openvrml::field_value::mfdouble_id + * + * @brief Designates an @c mfdouble. + */ + + /** * @var openvrml::field_value::mfimage_id * *************** *** 343,346 **** --- 370,379 ---- /** + * @var openvrml::field_value::mfvec2d_id + * + * @brief Designates an @c mfvec2d. + */ + + /** * @var openvrml::field_value::mfvec3f_id * *************** *** 348,351 **** --- 381,390 ---- */ + /** + * @var openvrml::field_value::mfvec3d_id + * + * @brief Designates an @c mfvec3d. + */ + namespace { |
|
From: Braden M. <br...@us...> - 2006-03-06 04:21:51
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710 Modified Files: ChangeLog Log Message: Doc-comment improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1175 retrieving revision 1.1176 diff -C2 -d -r1.1175 -r1.1176 *** ChangeLog 6 Mar 2006 03:46:40 -0000 1.1175 --- ChangeLog 6 Mar 2006 04:21:46 -0000 1.1176 *************** *** 1,4 **** --- 1,9 ---- 2006-03-05 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/field_value.cpp: Doc-comment + improvements. + + 2006-03-05 Braden McDaniel <br...@en...> + Moved definitions of FieldValue::field_value_type_id to field_value.h. |
