From: <br...@us...> - 2008-03-27 01:49:03
|
Revision: 3427 http://openvrml.svn.sourceforge.net/openvrml/?rev=3427&view=rev Author: braden Date: 2008-03-26 18:49:04 -0700 (Wed, 26 Mar 2008) Log Message: ----------- Moved X3D Rendering component description to XML. Modified Paths: -------------- branches/node-modules/src/libopenvrml/openvrml/browser.cpp Added Paths: ----------- branches/node-modules/data/component/rendering.xml Added: branches/node-modules/data/component/rendering.xml =================================================================== --- branches/node-modules/data/component/rendering.xml (rev 0) +++ branches/node-modules/data/component/rendering.xml 2008-03-27 01:49:04 UTC (rev 3427) @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component id="Rendering"> + <level> + <requires id="Grouping" level="1"/> + <node id="Color" + metatype-id="urn:X-openvrml:node:Color"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="MFColor" access-type="inputOutput" /> + </node> + <node id="ColorRGBA" + metatype-id="urn:X-openvrml:node:ColorRGBA"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="MFColorRGBA" access-type="inputOutput" /> + </node> + <node id="Coordinate" + metatype-id="urn:X-openvrml:node:Coordinate"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="point" type="MFVec3f" access-type="inputOutput" /> + </node> + <node id="IndexedLineSet" + metatype-id="urn:X-openvrml:node:IndexedLineSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="set_colorIndex" type="MFInt32" access-type="inputOnly" /> + <field id="set_coordIndex" type="MFInt32" access-type="inputOnly" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="colorIndex" type="MFInt32" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="coordIndex" type="MFInt32" access-type="initializeOnly" /> + </node> + <node id="LineSet" + metatype-id="urn:X-openvrml:node:LineSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="vertexCount" type="MFInt32" access-type="inputOutput" /> + </node> + <node id="PointSet" + metatype-id="urn:X-openvrml:node:PointSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + </node> + </level> + <level> + <node id="Normal" + metatype-id="urn:X-openvrml:node:Normal"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="vector" type="MFVec3f" access-type="inputOutput" /> + </node> + </level> + <level> + <node id="IndexedTriangleFanSet" + metatype-id="urn:X-openvrml:node:IndexedTriangleFanSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="set_index" type="MFInt32" access-type="inputOnly" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + <field id="index" type="MFInt32" access-type="initializeOnly" /> + </node> + <node id="IndexedTriangleSet" + metatype-id="urn:X-openvrml:node:IndexedTriangleSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="set_index" type="MFInt32" access-type="inputOnly" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + <field id="index" type="MFInt32" access-type="initializeOnly" /> + </node> + <node id="IndexedTriangleStripSet" + metatype-id="urn:X-openvrml:node:IndexedTriangleStripSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="set_index" type="MFInt32" access-type="inputOnly" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="creaseAngle" type="SFFloat" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + <field id="index" type="MFInt32" access-type="initializeOnly" /> + </node> + <node id="TriangleFanSet" + metatype-id="urn:X-openvrml:node:TriangleFanSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="fanCount" type="MFInt32" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + </node> + <node id="TriangleSet" + metatype-id="urn:X-openvrml:node:TriangleSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + </node> + <node id="TriangleStripSet" + metatype-id="urn:X-openvrml:node:TriangleStripSet"> + <field id="metadata" type="SFNode" access-type="inputOutput" /> + <field id="color" type="SFNode" access-type="inputOutput" /> + <field id="coord" type="SFNode" access-type="inputOutput" /> + <field id="normal" type="SFNode" access-type="inputOutput" /> + <field id="stripCount" type="MFInt32" access-type="inputOutput" /> + <field id="texCoord" type="SFNode" access-type="inputOutput" /> + <field id="ccw" type="SFBool" access-type="initializeOnly" /> + <field id="colorPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="normalPerVertex" type="SFBool" access-type="initializeOnly" /> + <field id="solid" type="SFBool" access-type="initializeOnly" /> + </node> + </level> + <level/> <!-- Level 4 has no additional nodes. --> +</component> Modified: branches/node-modules/src/libopenvrml/openvrml/browser.cpp =================================================================== --- branches/node-modules/src/libopenvrml/openvrml/browser.cpp 2008-03-26 22:38:45 UTC (rev 3426) +++ branches/node-modules/src/libopenvrml/openvrml/browser.cpp 2008-03-27 01:49:04 UTC (rev 3427) @@ -12189,659 +12189,6 @@ using openvrml::field_value; - class OPENVRML_LOCAL x3d_rendering_component : public component { - static const boost::array<node_interface, 2> - color_interfaces_; - static const boost::array<node_interface, 2> - color_rgba_interfaces_; - static const boost::array<node_interface, 2> - coordinate_interfaces_; - static const boost::array<node_interface, 8> - indexed_line_set_interfaces_; - static const boost::array<node_interface, 4> - line_set_interfaces_; - static const boost::array<node_interface, 3> - point_set_interfaces_; - static const boost::array<node_interface, 2> - normal_interfaces_; - static const boost::array<node_interface, 11> - indexed_triangle_fan_set_interfaces_; - static const boost::array<node_interface, 11> - indexed_triangle_set_interfaces_; - static const boost::array<node_interface, 12> - indexed_triangle_strip_set_interfaces_; - static const boost::array<node_interface, 10> - triangle_fan_set_interfaces_; - static const boost::array<node_interface, 9> - triangle_set_interfaces_; - static const boost::array<node_interface, 10> - triangle_strip_set_interfaces_; - - public: - static const char * const id; - - virtual size_t support_level() const OPENVRML_NOTHROW; - - private: - virtual void do_add_to_scope(const openvrml::browser & b, - openvrml::scope & scope, - size_t level) const - OPENVRML_THROW1(std::bad_alloc); - - virtual void - do_add_to_node_type_desc_map( - openvrml::node_type_decls & type_descs, size_t level) const - OPENVRML_THROW1(std::bad_alloc); - }; - - const boost::array<node_interface, 2> - x3d_rendering_component::color_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::mfcolor_id, - "color") - }; - - const boost::array<node_interface, 2> - x3d_rendering_component::color_rgba_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::mfcolorrgba_id, - "color") - }; - - const boost::array<node_interface, 2> - x3d_rendering_component::coordinate_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::mfvec3f_id, - "point") - }; - - const boost::array<node_interface, 8> - x3d_rendering_component::indexed_line_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::eventin_id, - field_value::mfint32_id, - "set_colorIndex"), - node_interface(node_interface::eventin_id, - field_value::mfint32_id, - "set_coordIndex"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::field_id, - field_value::mfint32_id, - "colorIndex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::mfint32_id, - "coordIndex") - }; - - const boost::array<node_interface, 4> - x3d_rendering_component::line_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "vertexCount") - }; - - const boost::array<node_interface, 3> - x3d_rendering_component::point_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord") - }; - - const boost::array<node_interface, 2> - x3d_rendering_component::normal_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::mfvec3f_id, - "vector") - }; - - const boost::array<node_interface, 11> - x3d_rendering_component::indexed_triangle_fan_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::eventin_id, - field_value::mfint32_id, - "set_index"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid"), - node_interface(node_interface::field_id, - field_value::mfint32_id, - "index") - }; - - const boost::array<node_interface, 11> - x3d_rendering_component::indexed_triangle_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::eventin_id, - field_value::mfint32_id, - "set_index"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid"), - node_interface(node_interface::field_id, - field_value::mfint32_id, - "index") - }; - - const boost::array<node_interface, 12> - x3d_rendering_component::indexed_triangle_strip_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::eventin_id, - field_value::mfint32_id, - "set_index"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::sffloat_id, - "creaseAngle"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid"), - node_interface(node_interface::field_id, - field_value::mfint32_id, - "index") - }; - - const boost::array<node_interface, 10> - x3d_rendering_component::triangle_fan_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "fanCount"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid") - }; - - const boost::array<node_interface, 9> - x3d_rendering_component::triangle_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid") - }; - - const boost::array<node_interface, 10> - x3d_rendering_component::triangle_strip_set_interfaces_ = { - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "metadata"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "color"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "coord"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "normal"), - node_interface(node_interface::exposedfield_id, - field_value::mfint32_id, - "stripCount"), - node_interface(node_interface::exposedfield_id, - field_value::sfnode_id, - "texCoord"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "ccw"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "colorPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "normalPerVertex"), - node_interface(node_interface::field_id, - field_value::sfbool_id, - "solid") - }; - - const char * const x3d_rendering_component::id = "Rendering"; - - size_t x3d_rendering_component::support_level() const OPENVRML_NOTHROW - { - return 4; - } - - void - x3d_rendering_component::do_add_to_scope(const openvrml::browser & b, - openvrml::scope & scope, - const size_t level) const - OPENVRML_THROW1(std::bad_alloc) - { - using namespace openvrml; - - if (level >= 1) { - // - // Color node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::color_interfaces_.begin(), - x3d_rendering_component::color_interfaces_.end()); - add_scope_entry(b, - "Color", - interface_set, - "urn:X-openvrml:node:Color", - scope); - } - - // - // ColorRGBA node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::color_rgba_interfaces_.begin(), - x3d_rendering_component::color_rgba_interfaces_.end()); - add_scope_entry(b, - "ColorRGBA", - interface_set, - "urn:X-openvrml:node:ColorRGBA", - scope); - } - - // - // Coordinate node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::coordinate_interfaces_.begin(), - x3d_rendering_component::coordinate_interfaces_.end()); - add_scope_entry(b, - "Coordinate", - interface_set, - "urn:X-openvrml:node:Coordinate", - scope); - } - - // - // IndexedLineSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::indexed_line_set_interfaces_.begin(), - x3d_rendering_component::indexed_line_set_interfaces_.end()); - add_scope_entry(b, - "IndexedLineSet", - interface_set, - "urn:X-openvrml:node:IndexedLineSet", - scope); - } - - // - // LineSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::line_set_interfaces_.begin(), - x3d_rendering_component::line_set_interfaces_.end()); - add_scope_entry(b, - "LineSet", - interface_set, - "urn:X-openvrml:node:IndexedLineSet", - scope); - } - - // - // PointSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::point_set_interfaces_.begin(), - x3d_rendering_component::point_set_interfaces_.end()); - add_scope_entry(b, - "PointSet", - interface_set, - "urn:X-openvrml:node:PointSet", - scope); - } - } - - if (level >= 2) { - // - // Normal node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::normal_interfaces_.begin(), - x3d_rendering_component::normal_interfaces_.end()); - add_scope_entry(b, - "Normal", - interface_set, - "urn:X-openvrml:node:Normal", - scope); - } - } - - if (level >= 3) { - // - // IndexedTriangleFanSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::indexed_triangle_fan_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_fan_set_interfaces_.end()); - add_scope_entry(b, - "IndexedTriangleFanSet", - interface_set, - "urn:X-openvrml:node:IndexedTriangleFanSet", - scope); - } - - // - // IndexedTriangleSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::indexed_triangle_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_set_interfaces_.end()); - add_scope_entry(b, - "IndexedTriangleSet", - interface_set, - "urn:X-openvrml:node:IndexedTriangleSet", - scope); - } - - // - // IndexedTriangleStripSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::indexed_triangle_strip_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_strip_set_interfaces_.end()); - add_scope_entry(b, - "IndexedTriangleStripSet", - interface_set, - "urn:X-openvrml:node:IndexedTriangleStripSet", - scope); - } - - // - // TriangleFanSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::triangle_fan_set_interfaces_.begin(), - x3d_rendering_component::triangle_fan_set_interfaces_.end()); - add_scope_entry(b, - "TriangleFanSet", - interface_set, - "urn:X-openvrml:node:TriangleFanSet", - scope); - } - - // - // TriangleSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::triangle_set_interfaces_.begin(), - x3d_rendering_component::triangle_set_interfaces_.end()); - add_scope_entry(b, - "TriangleSet", - interface_set, - "urn:X-openvrml:node:TriangleSet", - scope); - } - - // - // TriangleStripSet node - // - { - static const node_interface_set - interface_set(x3d_rendering_component::triangle_strip_set_interfaces_.begin(), - x3d_rendering_component::triangle_strip_set_interfaces_.end()); - add_scope_entry(b, - "TriangleStripSet", - interface_set, - "urn:X-openvrml:node:TriangleStripSet", - scope); - } - } - } - - void - x3d_rendering_component:: - do_add_to_node_type_desc_map(openvrml::node_type_decls & type_descs, - const size_t level) const - OPENVRML_THROW1(std::bad_alloc) - { - using openvrml::node_interface_set; - component::add_type_desc( - type_descs, - "Color", - node_interface_set( - x3d_rendering_component::color_interfaces_.begin(), - x3d_rendering_component::color_interfaces_.end())); - component::add_type_desc( - type_descs, - "ColorRGBA", - node_interface_set( - x3d_rendering_component::color_interfaces_.begin(), - x3d_rendering_component::color_interfaces_.end())); - component::add_type_desc( - type_descs, - "Coordinate", - node_interface_set( - x3d_rendering_component::coordinate_interfaces_.begin(), - x3d_rendering_component::coordinate_interfaces_.end())); - component::add_type_desc( - type_descs, - "IndexedLineSet", - node_interface_set( - x3d_rendering_component::indexed_line_set_interfaces_.begin(), - x3d_rendering_component::indexed_line_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "LineSet", - node_interface_set( - x3d_rendering_component::line_set_interfaces_.begin(), - x3d_rendering_component::line_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "PointSet", - node_interface_set( - x3d_rendering_component::point_set_interfaces_.begin(), - x3d_rendering_component::point_set_interfaces_.end())); - - if (level >= 2) { - component::add_type_desc( - type_descs, - "Normal", - node_interface_set( - x3d_rendering_component::normal_interfaces_.begin(), - x3d_rendering_component::normal_interfaces_.end())); - } - - if (level >= 3) { - component::add_type_desc( - type_descs, - "IndexedTriangleFanSet", - node_interface_set( - x3d_rendering_component::indexed_triangle_fan_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_fan_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "IndexedTriangleSet", - node_interface_set( - x3d_rendering_component::indexed_triangle_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "IndexedTriangleStripSet", - node_interface_set( - x3d_rendering_component::indexed_triangle_strip_set_interfaces_.begin(), - x3d_rendering_component::indexed_triangle_strip_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "TriangleFanSet", - node_interface_set( - x3d_rendering_component::triangle_fan_set_interfaces_.begin(), - x3d_rendering_component::triangle_fan_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "TriangleSet", - node_interface_set( - x3d_rendering_component::triangle_set_interfaces_.begin(), - x3d_rendering_component::triangle_set_interfaces_.end())); - component::add_type_desc( - type_descs, - "TriangleStripSet", - node_interface_set( - x3d_rendering_component::triangle_strip_set_interfaces_.begin(), - x3d_rendering_component::triangle_strip_set_interfaces_.end())); - } - } - - class OPENVRML_LOCAL x3d_shape_component : public component { static const boost::array<openvrml::node_interface, 6> appearance_interfaces_; @@ -19574,10 +18921,6 @@ } } - key = x3d_rendering_component::id; - succeeded = this->insert(key, new x3d_rendering_component).second; - assert(succeeded); - key = x3d_shape_component::id; succeeded = this->insert(key, new x3d_shape_component).second; assert(succeeded); @@ -19740,7 +19083,7 @@ this->add_component("Core", 1); this->add_component("Time", 1); this->add_component("Grouping", 1); - this->add_component(x3d_rendering_component::id, 3); + this->add_component("Rendering", 3); this->add_component(x3d_shape_component::id, 1); this->add_component(x3d_geometry3d_component::id, 2); this->add_component(x3d_lighting_component::id, 1); @@ -19758,7 +19101,7 @@ this->add_component("Core", 1); this->add_component("Time", 1); this->add_component("Grouping", 2); - this->add_component(x3d_rendering_component::id, 2); + this->add_component("Rendering", 2); this->add_component(x3d_shape_component::id, 1); this->add_component(x3d_geometry3d_component::id, 3); this->add_component(x3d_lighting_component::id, 2); @@ -19781,7 +19124,7 @@ this->add_component("Time", 1); this->add_component("Networking", 2); this->add_component("Grouping", 2); - this->add_component(x3d_rendering_component::id, 1); + this->add_component("Rendering", 1); this->add_component(x3d_shape_component::id, 1); this->add_component(x3d_geometry3d_component::id, 2); this->add_component(x3d_lighting_component::id, 2); @@ -19802,7 +19145,7 @@ this->add_component("Time", 1); this->add_component("Networking", 3); this->add_component("Grouping", 2); - this->add_component(x3d_rendering_component::id, 3); + this->add_component("Rendering", 3); this->add_component(x3d_shape_component::id, 2); this->add_component(x3d_geometry3d_component::id, 4); this->add_component(x3d_geometry2d_component::id, 1); @@ -19828,7 +19171,7 @@ this->add_component("Time", 2); this->add_component("Networking", 3); this->add_component("Grouping", 3); - this->add_component(x3d_rendering_component::id, 4); + this->add_component("Rendering", 4); this->add_component(x3d_shape_component::id, 3); this->add_component(x3d_geometry3d_component::id, 4); this->add_component(x3d_geometry2d_component::id, 2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |