Menu
▾
▴
[openvrml-commit] openvrml/src/libopenvrml/openvrml x3d_environmental_effects.cpp,NONE,1.1 x3d_environmental_effects.h,NONE,1.1 browser.cpp,1.170,1.171
|
From: Braden M. <br...@us...> - 2006-04-22 03:29:21
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20646/src/libopenvrml/openvrml Modified Files: browser.cpp Added Files: x3d_environmental_effects.cpp x3d_environmental_effects.h Log Message: Added support for creating scene graphs with the level 3 nodes of the EnvironmentalEffects component. From Andrew Grieve <sg...@us...> Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** browser.cpp 21 Apr 2006 14:33:12 -0000 1.170 --- browser.cpp 22 Apr 2006 03:29:04 -0000 1.171 *************** *** 58,61 **** --- 58,62 ---- # include "x3d_event_utilities.h" # include "x3d_dis.h" + # include "x3d_environmental_effects.h" # include "x3d_geospatial.h" # include "x3d_hanim.h" *************** *** 6012,6015 **** --- 6013,6017 ---- register_event_utilities_node_classes(b); register_dis_node_classes(b); + register_environmental_effects_node_classes(b); register_geospatial_node_classes(b); register_hanim_node_classes(b); *************** *** 13339,13343 **** OPENVRML_NOTHROW { ! return 2; } --- 13341,13345 ---- OPENVRML_NOTHROW { ! return 3; } *************** *** 13449,13452 **** --- 13451,13517 ---- } } + + if (level >= 3) { + // + // TextureBackground node + // + { + static const node_interface interfaces[] = { + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "metadata"), + node_interface(node_interface::eventin_id, + field_value::sfbool_id, + "set_bind"), + node_interface(node_interface::exposedfield_id, + field_value::mffloat_id, + "groundAngle"), + node_interface(node_interface::exposedfield_id, + field_value::mfcolor_id, + "groundColor"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "backTexture"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "bottomTexture"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "frontTexture"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "leftTexture"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "rightTexture"), + node_interface(node_interface::exposedfield_id, + field_value::sfnode_id, + "topTexture"), + node_interface(node_interface::exposedfield_id, + field_value::mffloat_id, + "skyAngle"), + node_interface(node_interface::exposedfield_id, + field_value::mfcolor_id, + "skyColor"), + node_interface(node_interface::exposedfield_id, + field_value::mffloat_id, + "transparency"), + node_interface(node_interface::eventout_id, + field_value::sftime_id, + "bindTime"), + node_interface(node_interface::eventout_id, + field_value::sfbool_id, + "isBound") + }; + + static const node_interface_set interface_set(interfaces, + interfaces + 15); + add_scope_entry(b, + "TextureBackground", + interface_set, + "urn:X-openvrml:node:TextureBackground", + scope); + } + } } --- NEW FILE: x3d_environmental_effects.cpp --- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- // // OpenVRML // // Copyright 1998 Chris Morley // Copyright 2001, 2002, 2003, 2004, 2005 Braden McDaniel // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # ifdef HAVE_CONFIG_H # include <config.h> # endif # include <boost/array.hpp> # include <private.h> # include "browser.h" # include "node_impl_util.h" # include "x3d_environmental_effects.h" using namespace openvrml; using namespace openvrml::node_impl_util; using namespace std; namespace { /** * @brief Class object for TextureBackground nodes. */ class OPENVRML_LOCAL texture_background_class : public node_class { public: static const char * const id; explicit texture_background_class(openvrml::browser & browser); virtual ~texture_background_class() OPENVRML_NOTHROW; private: virtual const boost::shared_ptr<node_type> do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc); }; } void register_environmental_effects_node_classes(openvrml::browser & b) { using boost::shared_ptr; using openvrml::node_class; b.add_node_class(texture_background_class::id, shared_ptr<node_class>(new texture_background_class(b))); } namespace { using namespace openvrml_; class OPENVRML_LOCAL texture_background_node : public abstract_node<texture_background_node>, public child_node { friend class texture_background_class; class set_bind_listener : public event_listener_base<self_t>, public sfbool_listener { public: explicit set_bind_listener(self_t & node); virtual ~set_bind_listener() OPENVRML_NOTHROW; private: virtual void do_process_event(const sfbool & fraction, double timestamp) OPENVRML_THROW1(std::bad_alloc); }; set_bind_listener set_bind_listener_; exposedfield<mffloat> ground_angle_; exposedfield<mfcolor> ground_color_; exposedfield<sfnode> back_texture_; exposedfield<sfnode> bottom_texture_; exposedfield<sfnode> front_texture_; exposedfield<sfnode> left_texture_; exposedfield<sfnode> right_texture_; exposedfield<sfnode> top_texture_; exposedfield<mffloat> sky_angle_; exposedfield<mfcolor> sky_color_; exposedfield<mffloat> transparency_; sftime bind_time_; sftime_emitter bind_time_emitter_; sfbool is_bound_; sfbool_emitter is_bound_emitter_; public: texture_background_node(const node_type & type, const boost::shared_ptr<openvrml::scope> & scope); virtual ~texture_background_node() OPENVRML_NOTHROW; }; /** * @brief @c node_class identifier. */ const char * const texture_background_class::id = "urn:X-openvrml:node:TextureBackground"; /** * @brief Construct. * * @param browser the @c browser associated with this * @c texture_background_class. */ texture_background_class:: texture_background_class(openvrml::browser & browser): node_class(texture_background_class::id, browser) {} /** * @brief Destroy. */ texture_background_class::~texture_background_class() OPENVRML_NOTHROW {} /** * @brief Create a node_type. * * @param id the name for the new node_type. * @param interfaces the interfaces for the new node_type. * * @return a node_type_ptr to a node_type capable of creating TextureBackground nodes. * * @exception unsupported_interface if @p interfaces includes an interface * not supported by texture_background_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> texture_background_class:: do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { typedef boost::array<node_interface, 15> supported_interfaces_t; static const supported_interfaces_t supported_interfaces = { node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "metadata"), node_interface(node_interface::eventin_id, field_value::sfbool_id, "set_bind"), node_interface(node_interface::exposedfield_id, field_value::mffloat_id, "groundAngle"), node_interface(node_interface::exposedfield_id, field_value::mfcolor_id, "groundColor"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "backTexture"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "bottomTexture"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "frontTexture"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "leftTexture"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "rightTexture"), node_interface(node_interface::exposedfield_id, field_value::sfnode_id, "topTexture"), node_interface(node_interface::exposedfield_id, field_value::mffloat_id, "skyAngle"), node_interface(node_interface::exposedfield_id, field_value::mfcolor_id, "skyColor"), node_interface(node_interface::exposedfield_id, field_value::mffloat_id, "transparency"), node_interface(node_interface::eventout_id, field_value::sftime_id, "bindTime"), node_interface(node_interface::eventout_id, field_value::sfbool_id, "isBound") }; typedef node_type_impl<texture_background_node> node_type_t; const boost::shared_ptr<node_type> type(new node_type_t(*this, id)); node_type_t & the_node_type = static_cast<node_type_t &>(*type); for (node_interface_set::const_iterator interface(interfaces.begin()); interface != interfaces.end(); ++interface) { supported_interfaces_t::const_iterator supported_interface = supported_interfaces.begin() - 1; if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::metadata)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::metadata)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::metadata))); } else if (*interface == *++supported_interface) { the_node_type.add_eventin( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< texture_background_node::set_bind_listener>( &texture_background_node::set_bind_listener_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::ground_angle_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::ground_angle_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::ground_angle_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::ground_color_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::ground_color_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::ground_color_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::back_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::back_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::back_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::bottom_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::bottom_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::bottom_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::front_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::front_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::front_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::left_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::left_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::left_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::right_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::right_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::right_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::top_texture_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::top_texture_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<sfnode> >( &texture_background_node::top_texture_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::sky_angle_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::sky_angle_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::sky_angle_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::sky_color_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::sky_color_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<mfcolor> >( &texture_background_node::sky_color_))); } else if (*interface == *++supported_interface) { the_node_type.add_exposedfield( supported_interface->field_type, supported_interface->id, node_type_t::event_listener_ptr_ptr( new node_type_t::event_listener_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::transparency_)), node_type_t::field_ptr_ptr( new node_type_t::field_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::transparency_)), node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< abstract_node<texture_background_node>::exposedfield<mffloat> >( &texture_background_node::transparency_))); } else if (*interface == *++supported_interface) { the_node_type.add_eventout( supported_interface->field_type, supported_interface->id, node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< texture_background_node::sftime_emitter>( &texture_background_node::bind_time_emitter_))); } else if (*interface == *++supported_interface) { the_node_type.add_eventout( supported_interface->field_type, supported_interface->id, node_type_t::event_emitter_ptr_ptr( new node_type_t::event_emitter_ptr< texture_background_node::sfbool_emitter>( &texture_background_node::is_bound_emitter_))); } else { throw unsupported_interface(*interface); } } return type; } /** * @class texture_background_node * * @brief Represents TextureBackground node instances. */ /** * @var texture_background_node::TextureBackground_class * * @brief Class object for TextureBackground nodes. */ /** * @var texture_background_node::set_bind_ * * @brief set_bind eventIn */ /** * @var texture_background_node::ground_angle_ * * @brief ground_angle exposedField */ /** * @var texture_background_node::ground_color_ * * @brief ground_color exposedField */ /** * @var texture_background_node::back_texture_ * * @brief back_texture exposedField */ /** * @var texture_background_node::bottom_texture_ * * @brief bottom_texture exposedField */ /** * @var texture_background_node::front_texture_ * * @brief front_texture exposedField */ /** * @var texture_background_node::left_texture_ * * @brief left_texture exposedField */ /** * @var texture_background_node::right_texture_ * * @brief right_texture exposedField */ /** * @var texture_background_node::top_texture_ * * @brief top_texture exposedField */ /** * @var texture_background_node::sky_angle_ * * @brief sky_angle exposedField */ /** * @var texture_background_node::sky_color_ * * @brief sky_color exposedField */ /** * @var texture_background_node::transparency_ * * @brief transparency exposedField */ /** * @var texture_background_node::bind_time_ * * @brief bind_time eventOut */ /** * @var texture_background_node::is_bound_ * * @brief is_bound eventOut */ texture_background_node::set_bind_listener:: set_bind_listener(self_t & node): node_event_listener(node), event_listener_base<self_t>(node), sfbool_listener(node) {} texture_background_node::set_bind_listener:: ~set_bind_listener() OPENVRML_NOTHROW {} void texture_background_node::set_bind_listener:: do_process_event(const sfbool & /* fraction */, const double /* timestamp */) OPENVRML_THROW1(std::bad_alloc) { //TODO: add logic here } /** * @brief Construct. * * @param type the node_type associated with this node. * @param scope the scope to which the node belongs. */ texture_background_node:: texture_background_node(const node_type & type, const boost::shared_ptr<openvrml::scope> & scope): node(type, scope), bounded_volume_node(type, scope), abstract_node<self_t>(type, scope), child_node(type, scope), set_bind_listener_(*this), ground_angle_(*this), ground_color_(*this), back_texture_(*this), bottom_texture_(*this), front_texture_(*this), left_texture_(*this), right_texture_(*this), top_texture_(*this), sky_angle_(*this), sky_color_(*this), transparency_(*this), bind_time_emitter_(*this, this->bind_time_), is_bound_emitter_(*this, this->is_bound_) {} /** * @brief Destroy. */ texture_background_node::~texture_background_node() OPENVRML_NOTHROW {} } --- NEW FILE: x3d_environmental_effects.h --- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- // // OpenVRML // // Copyright 1998 Chris Morley // Copyright 2001, 2002, 2003, 2004, 2005 Braden McDaniel // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # ifndef OPENVRML_X3D_ENVIRONMENTAL_EFFECTS_H # define OPENVRML_X3D_ENVIRONMENTAL_EFFECTS_H namespace openvrml { class browser; } extern "C" void register_environmental_effects_node_classes(openvrml::browser & b); # endif |
