Menu
▾
▴
[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.90,1.91
|
From: Braden M. <br...@us...> - 2005-11-03 07:48:13
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26789/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Removed helper class vrml97_node_interface_set_. This class was probably rendered unnecessary when openvrml::node_interface_set was changed from a class to a typedef of an instance of std::set. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** browser.cpp 2 Nov 2005 08:50:24 -0000 1.90 --- browser.cpp 3 Nov 2005 07:48:05 -0000 1.91 *************** *** 4156,4175 **** } - namespace { - /** - * @internal - */ - class OPENVRML_LOCAL vrml97_node_interface_set_ : - public openvrml::node_interface_set { - public: - vrml97_node_interface_set_( - const openvrml::node_interface * const begin, - const openvrml::node_interface * const end) - { - this->insert(begin, end); - } - }; - } - /** * @brief Create a root scope. --- 4156,4159 ---- *************** *** 4212,4216 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4196,4200 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4236,4240 **** "textureTransform") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = --- 4220,4224 ---- "textureTransform") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = *************** *** 4275,4279 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4259,4263 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4326,4330 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 12); node_class = --- 4310,4314 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 12); node_class = *************** *** 4359,4363 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = --- 4343,4347 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = *************** *** 4376,4380 **** field_value::sfvec3f_id, "size"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = this->node_class_map_.find("urn:X-openvrml:node:Box"); --- 4360,4364 ---- field_value::sfvec3f_id, "size"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = this->node_class_map_.find("urn:X-openvrml:node:Box"); *************** *** 4414,4418 **** "collideTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4398,4402 ---- "collideTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4431,4435 **** field_value::mfcolor_id, "color"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 4415,4419 ---- field_value::mfcolor_id, "color"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 4458,4462 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 4442,4446 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 4485,4489 **** "bottom") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = --- 4469,4473 ---- "bottom") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = *************** *** 4502,4506 **** field_value::mfvec3f_id, "point"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 4486,4490 ---- field_value::mfvec3f_id, "point"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 4529,4533 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 4513,4517 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 4560,4564 **** "top") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = --- 4544,4548 ---- "top") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = *************** *** 4602,4606 **** "trackPoint_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ --- 4586,4590 ---- "trackPoint_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ *************** *** 4632,4636 **** "on") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_ --- 4616,4620 ---- "on") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_ *************** *** 4689,4693 **** "zSpacing") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 14); node_class = this->node_class_map_ --- 4673,4677 ---- "zSpacing") }; ! static const node_interface_set interface_set(interfaces, interfaces + 14); node_class = this->node_class_map_ *************** *** 4746,4750 **** "spine") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 14); node_class = --- 4730,4734 ---- "spine") }; ! static const node_interface_set interface_set(interfaces, interfaces + 14); node_class = *************** *** 4776,4780 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_.find("urn:X-openvrml:node:Fog"); --- 4760,4764 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_.find("urn:X-openvrml:node:Fog"); *************** *** 4817,4821 **** "topToBottom") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = --- 4801,4805 ---- "topToBottom") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = *************** *** 4847,4851 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = --- 4831,4835 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = *************** *** 4871,4875 **** "repeatT") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ --- 4855,4859 ---- "repeatT") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ *************** *** 4940,4944 **** "texCoordIndex") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 18); node_class = this->node_class_map_ --- 4924,4928 ---- "texCoordIndex") }; ! static const node_interface_set interface_set(interfaces, interfaces + 18); node_class = this->node_class_map_ *************** *** 4976,4980 **** "coordIndex") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 4960,4964 ---- "coordIndex") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5000,5004 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = --- 4984,4988 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = *************** *** 5024,5028 **** "range") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_.find("urn:X-openvrml:node:LOD"); --- 5008,5012 ---- "range") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_.find("urn:X-openvrml:node:LOD"); *************** *** 5056,5060 **** "transparency") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = --- 5040,5044 ---- "transparency") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = *************** *** 5098,5102 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ --- 5082,5086 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ *************** *** 5134,5138 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 5118,5122 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5151,5155 **** field_value::mfvec3f_id, "vector"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 5135,5139 ---- field_value::mfvec3f_id, "vector"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 5178,5182 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5162,5166 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5205,5209 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5189,5193 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5230,5234 **** "repeatT") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ --- 5214,5218 ---- "repeatT") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ *************** *** 5269,5273 **** "translation_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ --- 5253,5257 ---- "translation_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ *************** *** 5305,5309 **** "radius") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = --- 5289,5293 ---- "radius") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = *************** *** 5326,5330 **** "coord") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5310,5314 ---- "coord") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5353,5357 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5337,5341 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5393,5397 **** "exitTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ --- 5377,5381 ---- "exitTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ *************** *** 5420,5424 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5404,5408 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5441,5445 **** "geometry") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5425,5429 ---- "geometry") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5486,5490 **** "spatialize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5470,5474 ---- "spatialize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5503,5507 **** field_value::sffloat_id, "radius"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 5487,5491 ---- field_value::sffloat_id, "radius"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 5536,5540 **** "trackPoint_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ --- 5520,5524 ---- "trackPoint_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ *************** *** 5581,5585 **** "radius") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5565,5569 ---- "radius") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5602,5606 **** "whichChoice") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5586,5590 ---- "whichChoice") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5629,5633 **** "maxExtent") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = --- 5613,5617 ---- "maxExtent") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = *************** *** 5646,5650 **** field_value::mfvec2f_id, "point"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = this->node_class_map_ --- 5630,5634 ---- field_value::mfvec2f_id, "point"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = this->node_class_map_ *************** *** 5673,5677 **** "translation") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5657,5661 ---- "translation") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5715,5719 **** "time") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = --- 5699,5703 ---- "time") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = *************** *** 5751,5755 **** "touchTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 5735,5739 ---- "touchTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5796,5800 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5780,5784 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5835,5839 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 5819,5823 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 5868,5872 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ --- 5852,5856 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ *************** *** 5889,5893 **** "title") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5873,5877 ---- "title") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = |
