openvrml-commit — Changes to OpenVRML's source revision repository

[openvrml-commit] openvrml ChangeLog,1.1196,1.1197

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3751

Modified Files:
	ChangeLog 
Log Message:
Added support for X3D Core profile.  Substantially modified patch from Andrew Grieve <sg...@us...>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -C2 -d -r1.1196 -r1.1197
*** ChangeLog	13 Mar 2006 06:46:09 -0000	1.1196
--- ChangeLog	17 Mar 2006 07:23:29 -0000	1.1197
***************
*** 1,2 ****
--- 1,52 ----
+ 2006-03-17 Braden McDaniel  <br...@en...>
+ 
+ 	Added support for X3D Core profile.  Substantially modified patch
+ 	from Andrew Grieve <sg...@us...>
+ 
+ 	* src/libopenvrml/Makefile.am
+ 	(openvrml_include_HEADERS): Added x3d_core.h.
+ 	(libopenvrml_la_SOURCES): Added x3d_core.cpp.
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(vrmlScene): Changed to use profile_registry.
+ 	* src/libopenvrml/openvrml/X3DVrmlParser.g
+ 	(vrmlScene): Construct the root scope based on the profile.
+ 	(profileStatement): Return the profile id.
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(create_root_scope(const openvrml::browser &, const
+ 	std::string&)): Removed function; moved logic to
+ 	profile::create_root_scope and vrml97_component::add_to_scope..
+ 	(profile): Added class to represent an X3D profile.
+ 	(vrml97_profile): Added class; a profile that corresponds to the
+ 	set of nodes available in VRML97.
+ 	(x3d_core_profile): Added class; corresponds to the X3D Core
+ 	profile.
+ 	(component): Added class to represent an X3D component.
+ 	(profile_registry_): A registry of profiles supported by OpenVRML.
+ 	(profile_registry::profile_registry()): Add the recognized
+ 	profiles to the map.
+ 	(component::~component()): Added destructor.
+ 	(component::add_scope_entry(const openvrml::browser &, const
+ 	char*, const openvrml::node_interface_set &, const char *,
+ 	openvrml::scope &) const): Added function; add a node_type to a
+ 	scope.
+ 	(openvrml::browser::browser(std::ostream &, std::ostream &)):
+ 	Register the X3D Core component node implementations.
+ 	(vrml97_component): Added class; a component that corresponds to
+ 	the set of nodes available in VRML97.
+ 	(vrml97_component::add_to_scope(const openvrml::browser &,
+ 	openvrml::scope &, int) const): Add the node_types in the
+ 	component to a scope.
+ 	(x3d_core_component): Added class; corresponds to the X3D Core
+ 	component.
+ 	(x3d_core_component::add_to_scope(const openvrml::browser &,
+ 	openvrml::scope &, int) const): Add the node_types in the
+ 	component to a scope.
+ 	(component_registry_): A registry of components supported by
+ 	OpenVRML.
+ 	* src/libopenvrml/openvrml/x3d_core.cpp: Added file; X3D Core
+ 	component node implementations.
+ 	* src/libopenvrml/openvrml/x3d_core.h: Added file; register the
+ 	X3D Core component node implementations.
+ 
  2006-03-13 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml Makefile.am,1.24,1.25

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3751/src/libopenvrml

Modified Files:
	Makefile.am 
Log Message:
Added support for X3D Core profile.  Substantially modified patch from Andrew Grieve <sg...@us...>

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.am	2 Jan 2006 00:49:46 -0000	1.24
--- Makefile.am	17 Mar 2006 07:23:29 -0000	1.25
***************
*** 18,23 ****
          openvrml/rendering_context.h \
          openvrml/frustum.h \
          openvrml/vrml97node.h \
!         openvrml/node_impl_util.h
  
  VRML97PARSER_BUILT_SOURCEFILES = \
--- 18,24 ----
          openvrml/rendering_context.h \
          openvrml/frustum.h \
+         openvrml/node_impl_util.h \
          openvrml/vrml97node.h \
!         openvrml/x3d_core.h
  
  VRML97PARSER_BUILT_SOURCEFILES = \
***************
*** 89,94 ****
          openvrml/rendering_context.cpp \
          openvrml/frustum.cpp \
          openvrml/vrml97node.cpp \
!         openvrml/node_impl_util.cpp
  
  libopenvrml_la_LDFLAGS = \
--- 90,96 ----
          openvrml/rendering_context.cpp \
          openvrml/frustum.cpp \
+         openvrml/node_impl_util.cpp \
          openvrml/vrml97node.cpp \
!         openvrml/x3d_core.cpp
  
  libopenvrml_la_LDFLAGS = \

[openvrml-commit] openvrml ChangeLog,1.1195,1.1196

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30431

Modified Files:
	ChangeLog 
Log Message:
Use ostream::put and char_traits<T>::to_char_type to prevent chars from being treated as ints.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -C2 -d -r1.1195 -r1.1196
*** ChangeLog	12 Mar 2006 23:42:13 -0000	1.1195
--- ChangeLog	13 Mar 2006 06:46:09 -0000	1.1196
***************
*** 1,2 ****
--- 1,9 ----
+ 2006-03-13 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(Vrml97Scanner::nextToken()): Use ostream::put and
+ 	char_traits<T>::to_char_type to prevent chars from being treated
+ 	as ints.
+ 
  2006-03-12 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.59,1.60

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30431/src/libopenvrml/openvrml

Modified Files:
	Vrml97Parser.g 
Log Message:
Use ostream::put and char_traits<T>::to_char_type to prevent chars from being treated as ints.

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Vrml97Parser.g	12 Mar 2006 07:38:44 -0000	1.59
--- Vrml97Parser.g	13 Mar 2006 06:46:09 -0000	1.60
***************
*** 208,211 ****
--- 208,213 ----
      using antlr::CommonToken;
  
+     typedef std::istream::traits_type traits_type;
+ 
      RefToken token(new CommonToken);
      ostringstream token_string;
***************
*** 236,240 ****
  
          while (this->isValidIdRestChars(this->c_)) {
!             token_string << this->c_;
              getNextChar();
          }
--- 238,242 ----
  
          while (this->isValidIdRestChars(this->c_)) {
!             token_string.put(traits_type::to_char_type(this->c_));
              getNextChar();
          }
***************
*** 258,262 ****
  
          if (this->c_ == '+' || this->c_ == '-') {
!             token_string << this->c_;
              this->getNextChar();
              read_too_much_ = true;
--- 260,264 ----
  
          if (this->c_ == '+' || this->c_ == '-') {
!             token_string.put(traits_type::to_char_type(this->c_));
              this->getNextChar();
              read_too_much_ = true;
***************
*** 269,273 ****
              token->setType(INTEGER);
  
!             token_string << this->c_;
  
              getNextChar();
--- 271,275 ----
              token->setType(INTEGER);
  
!             token_string.put(traits_type::to_char_type(this->c_));
  
              getNextChar();
***************
*** 280,292 ****
                  token->setType(HEX_INTEGER);
  
!                 token_string << this->c_;
                  getNextChar();
                  while (isxdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
              } else {
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
--- 282,294 ----
                  token->setType(HEX_INTEGER);
  
!                 token_string.put(traits_type::to_char_type(this->c_));
                  getNextChar();
                  while (isxdigit(this->c_)) {
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
                  }
              } else {
                  while (isdigit(this->c_)) {
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
                  }
***************
*** 299,307 ****
                  token->setType(REAL);
  
!                 token_string << this->c_;
                  getNextChar();
  
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
--- 301,309 ----
                  token->setType(REAL);
  
!                 token_string.put(traits_type::to_char_type(this->c_));
                  getNextChar();
  
                  while (isdigit(this->c_)) {
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
                  }
***************
*** 311,315 ****
                      // in an exponent
                      //
!                     token_string << this->c_;
                      getNextChar();
  
--- 313,317 ----
                      // in an exponent
                      //
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
  
***************
*** 318,326 ****
                          // exponent may be signed
                          //
!                         token_string << this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string << this->c_;
                              getNextChar();
                          }
--- 320,328 ----
                          // exponent may be signed
                          //
!                         token_string.put(traits_type::to_char_type(this->c_));
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string.put(traits_type::to_char_type(this->c_));
                              getNextChar();
                          }
***************
*** 333,337 ****
                  token->setType(REAL);
  
!                 token_string << this->c_;
                  getNextChar();
  
--- 335,339 ----
                  token->setType(REAL);
  
!                 token_string.put(traits_type::to_char_type(this->c_));
                  getNextChar();
  
***************
*** 340,348 ****
                      // exponent may be signed
                      //
!                     token_string << this->c_;
                      getNextChar();
  
                      while (isdigit(this->c_)) {
!                         token_string << this->c_;
                          getNextChar();
                      }
--- 342,350 ----
                      // exponent may be signed
                      //
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
  
                      while (isdigit(this->c_)) {
!                         token_string.put(traits_type::to_char_type(this->c_));
                          getNextChar();
                      }
***************
*** 357,361 ****
              //
  
!             token_string << this->c_;
              getNextChar();
  
--- 359,363 ----
              //
  
!             token_string.put(traits_type::to_char_type(this->c_));
              getNextChar();
  
***************
*** 365,369 ****
  
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
--- 367,371 ----
  
                  while (isdigit(this->c_)) {
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
                  }
***************
*** 373,377 ****
                      // in an exponent
                      //
!                     token_string << this->c_;
                      getNextChar();
  
--- 375,379 ----
                      // in an exponent
                      //
!                     token_string.put(traits_type::to_char_type(this->c_));
                      getNextChar();
  
***************
*** 380,388 ****
                          // exponent may be signed
                          //
!                         token_string << this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string << this->c_;
                              getNextChar();
                          }
--- 382,390 ----
                          // exponent may be signed
                          //
!                         token_string.put(traits_type::to_char_type(this->c_));
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string.put(traits_type::to_char_type(this->c_));
                              getNextChar();
                          }
***************
*** 404,417 ****
          token->setType(STRING);
  
!         token_string << this->c_;
          this->getNextChar();
  
          char prev_char('\0');
          while (this->c_ != '"' || prev_char == '\\') {
!             token_string << this->c_;
              prev_char = this->c_;
              this->getNextChar();
          }
!         token_string << this->c_; // add the closing quote
  
          token->setText(token_string.str());
--- 406,423 ----
          token->setType(STRING);
  
!         token_string.put(traits_type::to_char_type(this->c_));
          this->getNextChar();
  
          char prev_char('\0');
          while (this->c_ != '"' || prev_char == '\\') {
!             token_string.put(traits_type::to_char_type(this->c_));
              prev_char = this->c_;
              this->getNextChar();
          }
! 
!         //
!         // add the closing quote
!         //
!         token_string.put(traits_type::to_char_type(this->c_));
  
          token->setText(token_string.str());
***************
*** 421,425 ****
          // terminal symbol or unidentified character
          //
!         token_string << this->c_;
  
          token->setText(token_string.str());
--- 427,431 ----
          // terminal symbol or unidentified character
          //
!         token_string.put(traits_type::to_char_type(this->c_));
  
          token->setText(token_string.str());

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.146,1.147 browser.h,1.51,1.52

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27802/src/libopenvrml/openvrml

Modified Files:
	browser.cpp browser.h 
Log Message:
Shut down the existing nodes before replacing them in the openvrml::scene::nodes mutator.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** browser.cpp	12 Mar 2006 10:35:47 -0000	1.146
--- browser.cpp	12 Mar 2006 23:42:14 -0000	1.147
***************
*** 8129,8133 ****
      boost::recursive_mutex::scoped_lock lock(this->mutex_);
      const double now = browser::current_time();
-     this->scene_->shutdown(now);
      this->scene_->nodes(nodes);
      this->scene_->initialize(now);
--- 8129,8132 ----
***************
*** 9224,9238 ****
   * @brief Set the root nodes for the scene.
   *
!  * @todo This function should validate that the nodes in @p n are all part of
!  *       the same profile as <code>scene::profile</code>.
   *
   * @param[in] n the new root nodes for the scene.
   *
!  * @exception std::bad_alloc    if memory allocation fails.
   */
  void openvrml::scene::nodes(const std::vector<boost::intrusive_ptr<node> > & n)
!     OPENVRML_THROW1(std::bad_alloc)
  {
      boost::recursive_mutex::scoped_lock lock(this->nodes_mutex_);
      this->nodes_ = n;
  }
--- 9223,9251 ----
   * @brief Set the root nodes for the scene.
   *
!  * This function calls @c scene::shutdown to shut down the scene's existing nodes.
   *
   * @param[in] n the new root nodes for the scene.
   *
!  * @exception std::invalid_argument if any of the nodes in @p n has already been
!  *                                  initialized.
!  * @exception std::bad_alloc        if memory allocation fails.
   */
  void openvrml::scene::nodes(const std::vector<boost::intrusive_ptr<node> > & n)
!     OPENVRML_THROW2(std::invalid_argument, std::bad_alloc)
  {
+     class check_uninitialized_traverser : public node_traverser {
+     private:
+         virtual void on_entering(node & n)
+         {
+             if (n.scene()) {
+                 throw std::invalid_argument("node already initialized");
+             }
+         }
+     } check_uninitialized;
+     check_uninitialized.traverse(n);
+ 
      boost::recursive_mutex::scoped_lock lock(this->nodes_mutex_);
+     const double now = browser::current_time();
+     this->shutdown(now);
      this->nodes_ = n;
  }

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** browser.h	12 Mar 2006 10:09:47 -0000	1.51
--- browser.h	12 Mar 2006 23:42:14 -0000	1.52
***************
*** 386,390 ****
              OPENVRML_NOTHROW;
          void nodes(const std::vector<boost::intrusive_ptr<node> > & n)
!             OPENVRML_THROW1(std::bad_alloc);
          const scope * root_scope() const OPENVRML_NOTHROW;
          const std::string url() const OPENVRML_THROW1(std::bad_alloc);
--- 386,390 ----
              OPENVRML_NOTHROW;
          void nodes(const std::vector<boost::intrusive_ptr<node> > & n)
!             OPENVRML_THROW2(std::invalid_argument, std::bad_alloc);
          const scope * root_scope() const OPENVRML_NOTHROW;
          const std::string url() const OPENVRML_THROW1(std::bad_alloc);

[openvrml-commit] openvrml ChangeLog,1.1194,1.1195

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27802

Modified Files:
	ChangeLog 
Log Message:
Shut down the existing nodes before replacing them in the openvrml::scene::nodes mutator.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1194
retrieving revision 1.1195
diff -C2 -d -r1.1194 -r1.1195
*** ChangeLog	12 Mar 2006 10:35:46 -0000	1.1194
--- ChangeLog	12 Mar 2006 23:42:13 -0000	1.1195
***************
*** 1,4 ****
--- 1,20 ----
  2006-03-12 Braden McDaniel  <br...@en...>
  
+ 	Shut down the existing nodes before replacing them in the
+ 	openvrml::scene::nodes mutator.
+ 
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::scene): Changed node mutator to throw
+ 	std::invalid_argument if the argument nodes are already
+ 	initialized.
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::scene::nodes(const
+ 	std::vector<boost::intrusive_ptr<node> > &)): Throw
+ 	std::invalid_argument if any of the nodes in the argument vector
+ 	is already initialized; call shutdown for the existing nodes
+ 	before replacing them.
+ 
+ 2006-03-12 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/browser.cpp
  	(openvrml::scene::initialize(double)): "Fail" silently if a scene

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.145,1.146

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18807/src/libopenvrml/openvrml

Modified Files:
	browser.cpp 
Log Message:
"Fail" silently if a scene root node is not a child node.  This is consistent with the existing policy in OpenVRML: nodes that aren't the proper type simply don't get rendered.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** browser.cpp	12 Mar 2006 10:09:47 -0000	1.145
--- browser.cpp	12 Mar 2006 10:35:47 -0000	1.146
***************
*** 9138,9144 ****
          assert(*node);
          (*node)->initialize(*this, timestamp);
!         child_node * const child = node_cast<child_node *>(node->get());
!         assert(child);
!         child->relocate();
      }
  }
--- 9138,9144 ----
          assert(*node);
          (*node)->initialize(*this, timestamp);
!         if (child_node * const child = node_cast<child_node *>(node->get())) {
!             child->relocate();
!         }
      }
  }

[openvrml-commit] openvrml ChangeLog,1.1193,1.1194

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18807

Modified Files:
	ChangeLog 
Log Message:
"Fail" silently if a scene root node is not a child node.  This is consistent with the existing policy in OpenVRML: nodes that aren't the proper type simply don't get rendered.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1193
retrieving revision 1.1194
diff -C2 -d -r1.1193 -r1.1194
*** ChangeLog	12 Mar 2006 10:09:46 -0000	1.1193
--- ChangeLog	12 Mar 2006 10:35:46 -0000	1.1194
***************
*** 1,4 ****
--- 1,12 ----
  2006-03-12 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::scene::initialize(double)): "Fail" silently if a scene
+ 	root node is not a child node.  This is consistent with the
+ 	existing policy in OpenVRML: nodes that aren't the proper type
+ 	simply don't get rendered.
+ 
+ 2006-03-12 Braden McDaniel  <br...@en...>
+ 
  	Allow access to the root scene.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.144,1.145 browser.h,1.50,1.51

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4947/src/libopenvrml/openvrml

Modified Files:
	browser.cpp browser.h 
Log Message:
Allow access to the root scene.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** browser.cpp	12 Mar 2006 07:38:44 -0000	1.144
--- browser.cpp	12 Mar 2006 10:09:47 -0000	1.145
***************
*** 7626,7652 ****
  
  /**
!  * @brief Get the root nodes for the browser.
!  *
!  * @return the root nodes for the browser.
!  */
! const std::vector<boost::intrusive_ptr<openvrml::node> > &
! openvrml::browser::root_nodes() const
!     OPENVRML_NOTHROW
! {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(this->scene_);
!     return this->scene_->nodes();
! }
! 
! /**
!  * @brief Get the root scope.
   *
!  * @return the root scope.
   */
! const openvrml::scope * openvrml::browser::root_scope() const OPENVRML_NOTHROW
  {
      boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(this->scene_);
!     return this->scene_->root_scope();
  }
  
--- 7626,7637 ----
  
  /**
!  * @brief Get the root scene.
   *
!  * @return the root scene, or 0 if no scene is loaded.
   */
! openvrml::scene * openvrml::browser::root_scene() const OPENVRML_NOTHROW
  {
      boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     return this->scene_.get();
  }
  

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** browser.h	12 Mar 2006 07:38:44 -0000	1.50
--- browser.h	12 Mar 2006 10:09:47 -0000	1.51
***************
*** 269,275 ****
          node_class(const node_class_id & id) const OPENVRML_NOTHROW;
  
!         const std::vector<boost::intrusive_ptr<node> > & root_nodes() const
!             OPENVRML_NOTHROW;
!         const scope * root_scope() const OPENVRML_NOTHROW;
          const node_path find_node(const node & n) const
              OPENVRML_THROW1(std::bad_alloc);
--- 269,274 ----
          node_class(const node_class_id & id) const OPENVRML_NOTHROW;
  
!         scene * root_scene() const OPENVRML_NOTHROW;
! 
          const node_path find_node(const node & n) const
              OPENVRML_THROW1(std::bad_alloc);

[openvrml-commit] openvrml ChangeLog,1.1192,1.1193

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4947

Modified Files:
	ChangeLog 
Log Message:
Allow access to the root scene.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -C2 -d -r1.1192 -r1.1193
*** ChangeLog	12 Mar 2006 07:38:43 -0000	1.1192
--- ChangeLog	12 Mar 2006 10:09:46 -0000	1.1193
***************
*** 1,4 ****
--- 1,17 ----
  2006-03-12 Braden McDaniel  <br...@en...>
  
+ 	Allow access to the root scene.
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::browser::root_scene() const): Added function: access
+ 	the root scene.
+ 	(openvrml::browser::root_nodes() const): Removed function.
+ 	(openvrml::browser::root_scope() const): Removed function.
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::browser): Removed root_nodes and root_scope accessors;
+ 	added root_scene accessor.
+ 
+ 2006-03-12 Braden McDaniel  <br...@en...>
+ 
  	Store scene metadata (in X3D scenes).
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.58,1.59 X3DVrmlParser.g,1.16,1.17 browser.cpp,1.143,1.144 browser.h,1.49,1.50

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15853/src/libopenvrml/openvrml

Modified Files:
	Vrml97Parser.g X3DVrmlParser.g browser.cpp browser.h 
Log Message:
Store scene metadata (in X3D scenes).

Index: X3DVrmlParser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** X3DVrmlParser.g	9 Mar 2006 09:07:17 -0000	1.16
--- X3DVrmlParser.g	12 Mar 2006 07:38:44 -0000	1.17
***************
*** 227,231 ****
  
  vrmlScene[const openvrml::scene & scene,
!           std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
  {
--- 227,232 ----
  
  vrmlScene[const openvrml::scene & scene,
!           std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
!           std::map<std::string, std::string> & meta_data]
  options { defaultErrorHandler=false; }
  {
***************
*** 235,239 ****
  }
      :   profileStatement
!         (componentStatement)* (metaStatement)*
          (statement[scene, nodes, root_scope])*
      ;
--- 236,240 ----
  }
      :   profileStatement
!         (componentStatement)* (metaStatement[meta_data])*
          (statement[scene, nodes, root_scope])*
      ;
***************
*** 250,258 ****
      ;
  
! metaStatement
  {
      std::string key, value;
  }
!     :   KEYWORD_META key=stringValue value=stringValue
      ;
  
--- 251,261 ----
      ;
  
! metaStatement[std::map<std::string, std::string> & meta_data]
  {
      std::string key, value;
  }
!     :   KEYWORD_META key=stringValue value=stringValue {
!             meta_data[key] = value;
!         }
      ;
  

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** browser.cpp	9 Mar 2006 09:07:17 -0000	1.143
--- browser.cpp	12 Mar 2006 07:38:44 -0000	1.144
***************
*** 5582,5585 ****
--- 5582,5586 ----
       * @param[in]     scene a scene.
       * @param[out]    nodes the root nodes.
+      * @param[out]    meta  the scene metadata.
       *
       * @exception openvrml::bad_media_type 
***************
*** 5591,5595 ****
                 const std::string & type,
                 const openvrml::scene & scene,
!                std::vector<boost::intrusive_ptr<openvrml::node> > & nodes)
      {
          try {
--- 5592,5597 ----
                 const std::string & type,
                 const openvrml::scene & scene,
!                std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
!                std::map<std::string, std::string> & meta)
      {
          try {
***************
*** 5601,5609 ****
                  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);
--- 5603,5611 ----
                  Vrml97Scanner scanner(in);
                  Vrml97Parser parser(scanner, uri);
!                 parser.vrmlScene(scene, nodes, meta);
              } else if (iequals(type, x3d_vrml_media_type)) {
                  X3DVrmlScanner scanner(in);
                  X3DVrmlParser parser(scanner, uri);
!                 parser.vrmlScene(scene, nodes, meta);
              } else {
                  throw bad_media_type(type);
***************
*** 5653,5662 ****
  
                  //
!                 // We don't actually do anything with this; but the parser
!                 // wants it.
                  //
!                 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;
--- 5655,5666 ----
  
                  //
!                 // We don't actually do anything with these; but the parser
!                 // wants them.
                  //
!                 vector<boost::intrusive_ptr<node> > nodes;
!                 std::map<string, string> meta;
  
!                 parse_vrml(*in, in->url(), in->type(),
!                            *this->scene_, nodes, meta);
  
                  shared_ptr<openvrml::proto_node_class> proto_node_class;
***************
*** 8267,8271 ****
      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());
--- 8271,8276 ----
      try {
          assert(this->scene_);
!         std::map<string, string> meta;
!         parse_vrml(in, stream_id, type, *this->scene_, nodes, meta);
      } catch (openvrml::bad_media_type & ex) {
          throw std::invalid_argument(ex.what());
***************
*** 8902,8905 ****
--- 8907,8926 ----
   */
  
+ /**
+  * @internal
+  *
+  * @var boost::mutex openvrml::scene::meta_mutex_
+  *
+  * @brief Mutex protecting @a meta_.
+  */
+ 
+ /**
+  * @internal
+  *
+  * @var std::map<std::string, std::string> openvrml::scene::meta_
+  *
+  * @brief Scene metadata map.
+  */
+ 
  namespace {
  
***************
*** 9107,9114 ****
  {
      boost::recursive_mutex::scoped_lock nodes_lock(this->nodes_mutex_);
!     boost::mutex::scoped_lock url_lock(this->url_mutex_);
  
      this->url_ = in.url();
!     parse_vrml(in, in.url(), in.type(), *this, this->nodes_);
  }
  
--- 9128,9137 ----
  {
      boost::recursive_mutex::scoped_lock nodes_lock(this->nodes_mutex_);
!     boost::mutex::scoped_lock
!         url_lock(this->url_mutex_),
!         meta_lock(this->meta_mutex_);
  
      this->url_ = in.url();
!     parse_vrml(in, in.url(), in.type(), *this, this->nodes_, this->meta_);
  }
  
***************
*** 9137,9140 ****
--- 9160,9228 ----
  
  /**
+  * @brief Get metadata.
+  *
+  * @param[in] key   metadata key.
+  *
+  * @return the metadata value associated with @p key.
+  *
+  * @exception std::invalid_argument if there is no value associated with
+  *                                  @p key.
+  * @exception std::bad_alloc        if memory allocation fails.
+  */
+ const std::string openvrml::scene::meta(const std::string & key) const
+     OPENVRML_THROW2(std::invalid_argument, std::bad_alloc)
+ {
+     boost::mutex::scoped_lock lock(this->meta_mutex_);
+ 
+     using std::map;
+     using std::string;
+ 
+     const map<string, string>::const_iterator pos = this->meta_.find(key);
+     if (pos == this->meta_.end()) {
+         throw std::invalid_argument("no metadata value associated with \""
+                                     + key + "\"");
+     }
+     return pos->second;
+ }
+ 
+ /**
+  * @brief Set metadata.
+  *
+  * @param[in] key   metadata key.
+  * @param[in] value metadata value.
+  *
+  * @exception std::bad_alloc    if memory allocation fails.
+  */
+ void openvrml::scene::meta(const std::string & key, const std::string & value)
+     OPENVRML_THROW1(std::bad_alloc)
+ {
+     boost::mutex::scoped_lock lock(this->meta_mutex_);
+     this->meta_[key] = value;
+ }
+ 
+ /**
+  * @brief Get the metadata keys.
+  *
+  * @return the metadata keys.
+  */
+ const std::vector<std::string> openvrml::scene::meta_keys() const
+     OPENVRML_THROW1(std::bad_alloc)
+ {
+     boost::mutex::scoped_lock lock(this->meta_mutex_);
+ 
+     using std::map;
+     using std::string;
+     using std::vector;
+ 
+     vector<string> result;
+     for (map<string, string>::const_iterator entry = this->meta_.begin();
+          entry != this->meta_.end();
+          ++entry) {
+         result.push_back(entry->first);
+     }
+     return result;
+ }
+ 
+ /**
   * @brief Root nodes for the scene.
   *

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** browser.h	9 Mar 2006 05:19:17 -0000	1.49
--- browser.h	12 Mar 2006 07:38:44 -0000	1.50
***************
*** 364,367 ****
--- 364,370 ----
          std::string url_;
  
+         mutable boost::mutex meta_mutex_;
+         std::map<std::string, std::string> meta_;
+ 
      public:
          explicit scene(openvrml::browser & browser, scene * parent = 0)
***************
*** 375,378 ****
--- 378,387 ----
          void load(resource_istream & in);
          void initialize(double timestamp) OPENVRML_THROW1(std::bad_alloc);
+         const std::string meta(const std::string & key) const
+             OPENVRML_THROW2(std::invalid_argument, std::bad_alloc);
+         void meta(const std::string & key, const std::string & value)
+             OPENVRML_THROW1(std::bad_alloc);
+         const std::vector<std::string> meta_keys() const
+             OPENVRML_THROW1(std::bad_alloc);
          const std::vector<boost::intrusive_ptr<node> > & nodes() const
              OPENVRML_NOTHROW;

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Vrml97Parser.g	9 Mar 2006 09:07:17 -0000	1.58
--- Vrml97Parser.g	12 Mar 2006 07:38:44 -0000	1.59
***************
*** 614,620 ****
  
  vrmlScene[const openvrml::scene & scene,
!           std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
  {
      std::auto_ptr<openvrml::scope> root_scope_auto_ptr =
          create_root_scope(scene.browser(), this->uri);
--- 614,623 ----
  
  vrmlScene[const openvrml::scene & scene,
!           std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
!           std::map<std::string, std::string> & meta_data]
  options { defaultErrorHandler=false; }
  {
+     boost::ignore_unused_variable_warning(meta_data);
+ 
      std::auto_ptr<openvrml::scope> root_scope_auto_ptr =
          create_root_scope(scene.browser(), this->uri);

[openvrml-commit] openvrml ChangeLog,1.1191,1.1192

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15853

Modified Files:
	ChangeLog 
Log Message:
Store scene metadata (in X3D scenes).

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -C2 -d -r1.1191 -r1.1192
*** ChangeLog	9 Mar 2006 09:07:16 -0000	1.1191
--- ChangeLog	12 Mar 2006 07:38:43 -0000	1.1192
***************
*** 1,2 ****
--- 1,36 ----
+ 2006-03-12 Braden McDaniel  <br...@en...>
+ 
+ 	Store scene metadata (in X3D scenes).
+ 
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(vrmlScene): Added meta_data out-parameter; unused here, but
+ 	needed for X3DVrmlParser.
+ 	* src/libopenvrml/openvrml/X3DVrmlParser.g
+ 	(vrmlScene): Added meta_data out-parameter, passed to metaStatement.
+ 	(metaStatement): Put meta data into the meta_data map.
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(parse_vrml(std::istream &, const std::string &, const
+ 	std::string&, const openvrml::scene &,
+ 	std::vector<boost::intrusive_ptr<openvrml::node> > &,
+ 	std::map<std::string, std::string &)): Added meta out-parameter
+ 	for scene metadata.
+ 	(externproto_node_class::load_proto::operator()() const): Pass a
+ 	dummy metadata map to parse_vrml.
+ 	(openvrml::browser::create_vrml_from_stream(std::istream &, const
+ 	std::string &)): Pass a dummy metadata map to parse_vrml.
+ 	(openvrml::scene::load(resource_istream &)): Pass the scene
+ 	metadata map to parse_vrml.
+ 	(openvrml::scene::meta(const std::string &) const): Added
+ 	function: metadata accessor.
+ 	(openvrml::scene::meta(const std::string &, const std::string &)):
+ 	Added function: metadata mutator.
+ 	(openvrml::scene::meta_keys() const): Added function: get a vector
+ 	of the metadata keys.
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::scene): Added meta_ member to store scene metadata and
+ 	meta_mutex_ to protect it; added meta accessor and mutator
+ 	functions to add entries to the map and retrieve them; added
+ 	meta_keys member function to get a vector of the keys in the map.
+ 
  2006-03-09 Braden McDaniel  <br...@en...>
  
***************
*** 50,54 ****
  	(vrmlScene): Changed to take a const openvrml::scene reference.
  	(statement): Changed to take a const openvrml::scene reference.
- 
  	* src/libopenvrml/openvrml/browser.cpp
  	(parse_vrml(std::istream &, const std::string &, const
--- 84,87 ----

[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.57,1.58 X3DVrmlParser.g,1.15,1.16 browser.cpp,1.142,1.143

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14755/src/libopenvrml/openvrml

Modified Files:
	Vrml97Parser.g X3DVrmlParser.g browser.cpp 
Log Message:
Changed signature of parsing functions to take a const openvrml::scene.

Index: X3DVrmlParser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** X3DVrmlParser.g	27 Feb 2006 01:26:04 -0000	1.15
--- X3DVrmlParser.g	9 Mar 2006 09:07:17 -0000	1.16
***************
*** 226,230 ****
  }
  
! vrmlScene[openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
--- 226,230 ----
  }
  
! vrmlScene[const openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
***************
*** 257,261 ****
      ;
  
! statement[openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]
--- 257,261 ----
      ;
  
! statement[const openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** browser.cpp	9 Mar 2006 05:19:17 -0000	1.142
--- browser.cpp	9 Mar 2006 09:07:17 -0000	1.143
***************
*** 2293,2297 ****
  
      public:
!         externproto_node_class(openvrml::scene & scene,
                                 const std::vector<std::string> & uris)
              OPENVRML_THROW1(boost::thread_resource_error);
--- 2293,2297 ----
  
      public:
!         externproto_node_class(const openvrml::scene & scene,
                                 const std::vector<std::string> & uris)
              OPENVRML_THROW1(boost::thread_resource_error);
***************
*** 5580,5584 ****
       * @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.
       *
--- 5580,5584 ----
       * @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]     scene a scene.
       * @param[out]    nodes the root nodes.
       *
***************
*** 5590,5594 ****
                 const std::string & uri,
                 const std::string & type,
!                openvrml::scene & scene,
                 std::vector<boost::intrusive_ptr<openvrml::node> > & nodes)
      {
--- 5590,5594 ----
                 const std::string & uri,
                 const std::string & type,
!                const openvrml::scene & scene,
                 std::vector<boost::intrusive_ptr<openvrml::node> > & nodes)
      {
***************
*** 5621,5625 ****
      struct OPENVRML_LOCAL externproto_node_class::load_proto {
          load_proto(externproto_node_class & externproto_class,
!                    openvrml::scene & scene,
                     const std::vector<std::string> & alt_uris):
              externproto_node_class_(&externproto_class),
--- 5621,5625 ----
      struct OPENVRML_LOCAL externproto_node_class::load_proto {
          load_proto(externproto_node_class & externproto_class,
!                    const openvrml::scene & scene,
                     const std::vector<std::string> & alt_uris):
              externproto_node_class_(&externproto_class),
***************
*** 5706,5710 ****
      private:
          externproto_node_class * externproto_node_class_;
!         openvrml::scene * scene_;
          std::vector<std::string> alt_uris_;
      };
--- 5706,5710 ----
      private:
          externproto_node_class * externproto_node_class_;
!         const openvrml::scene * scene_;
          std::vector<std::string> alt_uris_;
      };
***************
*** 5720,5724 ****
       */
      externproto_node_class::
!     externproto_node_class(openvrml::scene & scene,
                             const std::vector<std::string> & uris)
          OPENVRML_THROW1(boost::thread_resource_error):
--- 5720,5724 ----
       */
      externproto_node_class::
!     externproto_node_class(const openvrml::scene & scene,
                             const std::vector<std::string> & uris)
          OPENVRML_THROW1(boost::thread_resource_error):

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Vrml97Parser.g	9 Mar 2006 06:43:32 -0000	1.57
--- Vrml97Parser.g	9 Mar 2006 09:07:17 -0000	1.58
***************
*** 613,617 ****
  }
  
! vrmlScene[openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
--- 613,617 ----
  }
  
! vrmlScene[const openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes]
  options { defaultErrorHandler=false; }
***************
*** 624,628 ****
      ;
  
! statement[openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]
--- 624,628 ----
      ;
  
! statement[const openvrml::scene & scene,
            std::vector<boost::intrusive_ptr<openvrml::node> > & nodes,
            const boost::shared_ptr<openvrml::scope> & scope]
***************
*** 641,645 ****
      ;
  
! nodeStatement[openvrml::scene & scene,
                const boost::shared_ptr<openvrml::scope> & scope,
                const std::string & script_node_id]
--- 641,645 ----
      ;
  
! nodeStatement[const openvrml::scene & scene,
                const boost::shared_ptr<openvrml::scope> & scope,
                const std::string & script_node_id]
***************
*** 671,675 ****
      ;
  
! protoStatement[openvrml::scene & scene,
                 const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
--- 671,675 ----
      ;
  
! protoStatement[const openvrml::scene & scene,
                 const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
***************
*** 682,686 ****
      ;
  
! proto[openvrml::scene & scene,
        const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
--- 682,686 ----
      ;
  
! proto[const openvrml::scene & scene,
        const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
***************
*** 758,762 ****
  
  protoInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<const openvrml::scope> & outer_scope,
      const std::string & proto_id,
--- 758,762 ----
  
  protoInterfaceDeclaration[
!     const openvrml::scene & scene,
      const boost::shared_ptr<const openvrml::scope> & outer_scope,
      const std::string & proto_id,
***************
*** 829,833 ****
      ;
  
! protoBody[openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & interfaces,
--- 829,833 ----
      ;
  
! protoBody[const openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & interfaces,
***************
*** 863,867 ****
  
  protoBodyStatement[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & interfaces,
--- 863,867 ----
  
  protoBodyStatement[
!     const openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & interfaces,
***************
*** 889,893 ****
      ;
  
! protoNodeStatement[openvrml::scene & scene,
                     const boost::shared_ptr<openvrml::scope> & scope,
                     const node_interface_set & proto_interfaces,
--- 889,893 ----
      ;
  
! protoNodeStatement[const openvrml::scene & scene,
                     const boost::shared_ptr<openvrml::scope> & scope,
                     const node_interface_set & proto_interfaces,
***************
*** 933,937 ****
      ;
  
! externproto[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
--- 933,937 ----
      ;
  
! externproto[const openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope]
  options { defaultErrorHandler=false; }
***************
*** 1191,1195 ****
      ;
  
! node[openvrml::scene & scene,
       const boost::shared_ptr<openvrml::scope> & scope,
       const std::string & node_id]
--- 1191,1195 ----
      ;
  
! node[const openvrml::scene & scene,
       const boost::shared_ptr<openvrml::scope> & scope,
       const std::string & node_id]
***************
*** 1263,1267 ****
      }
  
! nodeBodyElement[openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & interfaces,
--- 1263,1267 ----
      }
  
! nodeBodyElement[const openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & interfaces,
***************
*** 1310,1314 ****
      ;
  
! scriptInterfaceDeclaration[openvrml::scene & scene,
                             const boost::shared_ptr<openvrml::scope> & scope,
                             node_interface_set & interfaces,
--- 1310,1314 ----
      ;
  
! scriptInterfaceDeclaration[const openvrml::scene & scene,
                             const boost::shared_ptr<openvrml::scope> & scope,
                             node_interface_set & interfaces,
***************
*** 1344,1348 ****
  
  scriptFieldInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      node_interface_set & interfaces,
--- 1344,1348 ----
  
  scriptFieldInterfaceDeclaration[
!     const openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      node_interface_set & interfaces,
***************
*** 1381,1385 ****
      ;
  
! protoNode[openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & proto_interfaces,
--- 1381,1385 ----
      ;
  
! protoNode[const openvrml::scene & scene,
            const boost::shared_ptr<openvrml::scope> & scope,
            const node_interface_set & proto_interfaces,
***************
*** 1456,1460 ****
      ;
  
! protoNodeBodyElement[openvrml::scene & scene,
                       const boost::shared_ptr<openvrml::scope> & scope,
                       const node_interface_set & proto_interfaces,
--- 1456,1460 ----
      ;
  
! protoNodeBodyElement[const openvrml::scene & scene,
                       const boost::shared_ptr<openvrml::scope> & scope,
                       const node_interface_set & proto_interfaces,
***************
*** 1514,1518 ****
  
  protoScriptInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
--- 1514,1518 ----
  
  protoScriptInterfaceDeclaration[
!     const openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
***************
*** 1556,1560 ****
  
  protoScriptFieldInterfaceDeclaration[
!     openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
--- 1556,1560 ----
  
  protoScriptFieldInterfaceDeclaration[
!     const openvrml::scene & scene,
      const boost::shared_ptr<openvrml::scope> & scope,
      const node_interface_set & proto_interfaces,
***************
*** 1647,1651 ****
      ;
  
! fieldValue[openvrml::scene & scene,
             const boost::shared_ptr<openvrml::scope> & scope,
             const openvrml::field_value::type_id ft,
--- 1647,1651 ----
      ;
  
! fieldValue[const openvrml::scene & scene,
             const boost::shared_ptr<openvrml::scope> & scope,
             const openvrml::field_value::type_id ft,
***************
*** 1658,1662 ****
      ;
  
! protoFieldValue[openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & proto_interfaces,
--- 1658,1662 ----
      ;
  
! protoFieldValue[const openvrml::scene & scene,
                  const boost::shared_ptr<openvrml::scope> & scope,
                  const node_interface_set & proto_interfaces,
***************
*** 1703,1707 ****
      ;
  
! nodeFieldValue[openvrml::scene & scene,
                 const boost::shared_ptr<openvrml::scope> & scope,
                 openvrml::field_value::type_id ft,
--- 1703,1707 ----
      ;
  
! nodeFieldValue[const openvrml::scene & scene,
                 const boost::shared_ptr<openvrml::scope> & scope,
                 openvrml::field_value::type_id ft,
***************
*** 1718,1722 ****
      ;
  
! protoNodeFieldValue[openvrml::scene & scene,
                      const boost::shared_ptr<openvrml::scope> & scope,
                      const node_interface_set & proto_interfaces,
--- 1718,1722 ----
      ;
  
! protoNodeFieldValue[const openvrml::scene & scene,
                      const boost::shared_ptr<openvrml::scope> & scope,
                      const node_interface_set & proto_interfaces,
***************
*** 1909,1913 ****
      ;
  
! sfNodeValue[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
--- 1909,1913 ----
      ;
  
! sfNodeValue[const openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
***************
*** 1923,1927 ****
      ;
  
! protoSfNodeValue[openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
--- 1923,1927 ----
      ;
  
! protoSfNodeValue[const openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
***************
*** 1947,1951 ****
      ;
  
! mfNodeValue[openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
--- 1947,1951 ----
      ;
  
! mfNodeValue[const openvrml::scene & scene,
              const boost::shared_ptr<openvrml::scope> & scope,
              const std::string & script_node_id]
***************
*** 1973,1977 ****
      ;
  
! protoMfNodeValue[openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,
--- 1973,1977 ----
      ;
  
! protoMfNodeValue[const openvrml::scene & scene,
                   const boost::shared_ptr<openvrml::scope> & scope,
                   const node_interface_set & proto_interfaces,

[openvrml-commit] openvrml ChangeLog,1.1190,1.1191

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14755

Modified Files:
	ChangeLog 
Log Message:
Changed signature of parsing functions to take a const openvrml::scene.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -C2 -d -r1.1190 -r1.1191
*** ChangeLog	9 Mar 2006 06:43:32 -0000	1.1190
--- ChangeLog	9 Mar 2006 09:07:16 -0000	1.1191
***************
*** 1,4 ****
--- 1,68 ----
  2006-03-09 Braden McDaniel  <br...@en...>
  
+ 	Changed signature of parsing functions to take a const
+ 	openvrml::scene.
+ 
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(vrmlScene): Changed to take a const openvrml::scene reference.
+ 	(statement): Changed to take a const openvrml::scene reference.
+ 	(nodeStatement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(protoStatement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(proto): Changed to take a const openvrml::scene reference.
+ 	(protoInterfaceDeclaration): Changed to take a const
+ 	openvrml::scene reference.
+ 	(protoBody): Changed to take a const openvrml::scene reference.
+ 	(protoBodyStatement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(protoNodeStatement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(externproto): Changed to take a const openvrml::scene reference.
+ 	(node): Changed to take a const openvrml::scene reference.
+ 	(nodeBodyElement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(scriptInterfaceDeclaration): Changed to take a const
+ 	openvrml::scene reference.
+ 	(scriptFieldInterfaceDeclaration): Changed to take a const
+ 	openvrml::scene reference.
+ 	(protoNode): Changed to take a const openvrml::scene reference.
+ 	(protoNodeBodyElement): Changed to take a const openvrml::scene
+ 	reference.
+ 	(protoScriptInterfaceDeclaration): Changed to take a const
+ 	openvrml::scene reference.
+ 	(protoScriptFieldInterfaceDeclaration): Changed to take a const
+ 	openvrml::scene reference.
+ 	(fieldValue): Changed to take a const openvrml::scene reference.
+ 	(protoFieldValue): Changed to take a const openvrml::scene
+ 	reference.
+ 	(nodeFieldValue): Changed to take a const openvrml::scene
+ 	reference.
+ 	(protoNodeFieldValue): Changed to take a const openvrml::scene
+ 	reference.
+ 	(sfNodeValue): Changed to take a const openvrml::scene reference.
+ 	(protoSfNodeValue): Changed to take a const openvrml::scene
+ 	reference.
+ 	(mfNodeValue): Changed to take a const openvrml::scene reference.
+ 	(protoMfNodeValue): Changed to take a const openvrml::scene
+ 	reference.
+ 	* src/libopenvrml/openvrml/X3DVrmlParser.g
+ 	(vrmlScene): Changed to take a const openvrml::scene reference.
+ 	(statement): Changed to take a const openvrml::scene reference.
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(parse_vrml(std::istream &, const std::string &, const
+ 	std::string&, const openvrml::scene &,
+ 	std::vector<boost::intrusive_ptr<openvrml::node> > &)): Changed to
+ 	take a const openvrml::scene reference.
+ 	(externproto_node_class::load_proto::load_proto(externproto_node_class&,
+ 	const openvrml::scene &, const std::vector<std::string> &)):
+ 	Changed to take a const openvrml::scene reference.
+ 	(externproto_node_class(const openvrml::scene &, const
+ 	std::vector<std::string> &)): Changed to take a const
+ 	openvrml::scene reference.
+ 
+ 2006-03-09 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/Vrml97Parser.g
  	(Vrml97Scanner::nextToken()): Use std::ostringstream to compose

[openvrml-commit] openvrml/src/libopenvrml/openvrml Vrml97Parser.g,1.56,1.57

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2280/src/libopenvrml/openvrml

Modified Files:
	Vrml97Parser.g 
Log Message:
Use std::ostringstream to compose the token_string rather than appending to a std::string.

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** Vrml97Parser.g	5 Mar 2006 06:25:12 -0000	1.56
--- Vrml97Parser.g	9 Mar 2006 06:43:32 -0000	1.57
***************
*** 204,213 ****
  antlr::RefToken Vrml97Scanner::nextToken()
  {
!     using std::string;
      using antlr::RefToken;
      using antlr::CommonToken;
  
      RefToken token(new CommonToken);
!     string token_string;
  
      if (this->read_too_much_) {
--- 204,214 ----
  antlr::RefToken Vrml97Scanner::nextToken()
  {
!     using std::ostringstream;
      using antlr::RefToken;
      using antlr::CommonToken;
  
      RefToken token(new CommonToken);
!     ostringstream token_string;
!     token_string.unsetf(ostringstream::skipws);
  
      if (this->read_too_much_) {
***************
*** 235,239 ****
  
          while (this->isValidIdRestChars(this->c_)) {
!             token_string += this->c_;
              getNextChar();
          }
--- 236,240 ----
  
          while (this->isValidIdRestChars(this->c_)) {
!             token_string << this->c_;
              getNextChar();
          }
***************
*** 241,245 ****
          read_too_much_ = true;
  
!         token->setText(token_string);
  
          if (expecting_field_type_ && this->identifyFieldType(*token)) {
--- 242,246 ----
          read_too_much_ = true;
  
!         token->setText(token_string.str());
  
          if (expecting_field_type_ && this->identifyFieldType(*token)) {
***************
*** 257,261 ****
  
          if (this->c_ == '+' || this->c_ == '-') {
!             token_string += this->c_;
              this->getNextChar();
              read_too_much_ = true;
--- 258,262 ----
  
          if (this->c_ == '+' || this->c_ == '-') {
!             token_string << this->c_;
              this->getNextChar();
              read_too_much_ = true;
***************
*** 268,272 ****
              token->setType(INTEGER);
  
!             token_string += this->c_;
  
              getNextChar();
--- 269,273 ----
              token->setType(INTEGER);
  
!             token_string << this->c_;
  
              getNextChar();
***************
*** 279,291 ****
                  token->setType(HEX_INTEGER);
  
!                 token_string += this->c_;
                  getNextChar();
                  while (isxdigit(this->c_)) {
!                     token_string += this->c_;
                      getNextChar();
                  }
              } else {
                  while (isdigit(this->c_)) {
!                     token_string += this->c_;
                      getNextChar();
                  }
--- 280,292 ----
                  token->setType(HEX_INTEGER);
  
!                 token_string << this->c_;
                  getNextChar();
                  while (isxdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
              } else {
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
***************
*** 298,306 ****
                  token->setType(REAL);
  
!                 token_string += this->c_;
                  getNextChar();
  
                  while (isdigit(this->c_)) {
!                     token_string += this->c_;
                      getNextChar();
                  }
--- 299,307 ----
                  token->setType(REAL);
  
!                 token_string << this->c_;
                  getNextChar();
  
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
***************
*** 310,314 ****
                      // in an exponent
                      //
!                     token_string += this->c_;
                      getNextChar();
  
--- 311,315 ----
                      // in an exponent
                      //
!                     token_string << this->c_;
                      getNextChar();
  
***************
*** 317,325 ****
                          // exponent may be signed
                          //
!                         token_string += this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string += this->c_;
                              getNextChar();
                          }
--- 318,326 ----
                          // exponent may be signed
                          //
!                         token_string << this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string << this->c_;
                              getNextChar();
                          }
***************
*** 332,336 ****
                  token->setType(REAL);
  
!                 token_string += this->c_;
                  getNextChar();
  
--- 333,337 ----
                  token->setType(REAL);
  
!                 token_string << this->c_;
                  getNextChar();
  
***************
*** 339,347 ****
                      // exponent may be signed
                      //
!                     token_string += this->c_;
                      getNextChar();
  
                      while (isdigit(this->c_)) {
!                         token_string += this->c_;
                          getNextChar();
                      }
--- 340,348 ----
                      // exponent may be signed
                      //
!                     token_string << this->c_;
                      getNextChar();
  
                      while (isdigit(this->c_)) {
!                         token_string << this->c_;
                          getNextChar();
                      }
***************
*** 356,360 ****
              //
  
!             token_string += this->c_;
              getNextChar();
  
--- 357,361 ----
              //
  
!             token_string << this->c_;
              getNextChar();
  
***************
*** 364,368 ****
  
                  while (isdigit(this->c_)) {
!                     token_string += this->c_;
                      getNextChar();
                  }
--- 365,369 ----
  
                  while (isdigit(this->c_)) {
!                     token_string << this->c_;
                      getNextChar();
                  }
***************
*** 372,376 ****
                      // in an exponent
                      //
!                     token_string += this->c_;
                      getNextChar();
  
--- 373,377 ----
                      // in an exponent
                      //
!                     token_string << this->c_;
                      getNextChar();
  
***************
*** 379,387 ****
                          // exponent may be signed
                          //
!                         token_string += this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string += this->c_;
                              getNextChar();
                          }
--- 380,388 ----
                          // exponent may be signed
                          //
!                         token_string << this->c_;
                          getNextChar();
  
                          while (isdigit(this->c_)) {
!                             token_string << this->c_;
                              getNextChar();
                          }
***************
*** 395,399 ****
          }
  
!         token->setText(token_string);
  
      } else if (this->c_ == '"') {
--- 396,400 ----
          }
  
!         token->setText(token_string.str());
  
      } else if (this->c_ == '"') {
***************
*** 403,418 ****
          token->setType(STRING);
  
!         token_string += this->c_;
          this->getNextChar();
  
          char prev_char('\0');
          while (this->c_ != '"' || prev_char == '\\') {
!             token_string += this->c_;
              prev_char = this->c_;
              this->getNextChar();
          }
!         token_string += this->c_; // add the closing quote
  
!         token->setText(token_string);
  
      } else {
--- 404,419 ----
          token->setType(STRING);
  
!         token_string << this->c_;
          this->getNextChar();
  
          char prev_char('\0');
          while (this->c_ != '"' || prev_char == '\\') {
!             token_string << this->c_;
              prev_char = this->c_;
              this->getNextChar();
          }
!         token_string << this->c_; // add the closing quote
  
!         token->setText(token_string.str());
  
      } else {
***************
*** 420,426 ****
          // terminal symbol or unidentified character
          //
!         token_string += this->c_;
  
!         token->setText(token_string);
  
          this->identifyTerminalSymbol(*token);
--- 421,427 ----
          // terminal symbol or unidentified character
          //
!         token_string << this->c_;
  
!         token->setText(token_string.str());
  
          this->identifyTerminalSymbol(*token);

[openvrml-commit] openvrml ChangeLog,1.1189,1.1190

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2280

Modified Files:
	ChangeLog 
Log Message:
Use std::ostringstream to compose the token_string rather than appending to a std::string.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -C2 -d -r1.1189 -r1.1190
*** ChangeLog	9 Mar 2006 05:19:16 -0000	1.1189
--- ChangeLog	9 Mar 2006 06:43:32 -0000	1.1190
***************
*** 1,2 ****
--- 1,8 ----
+ 2006-03-09 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(Vrml97Scanner::nextToken()): Use std::ostringstream to compose
+ 	the token_string rather than appending to a std::string.
+ 
  2006-03-08 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.141,1.142 browser.h,1.48,1.49 script.cpp,1.67,1.68 vrml97node.cpp,1.99,1.100

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26027/src/libopenvrml/openvrml

Modified Files:
	browser.cpp browser.h script.cpp vrml97node.cpp 
Log Message:
Protect output and error streams associated with openvrml::browser with mutexes.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** browser.cpp	7 Mar 2006 23:51:39 -0000	1.141
--- browser.cpp	9 Mar 2006 05:19:17 -0000	1.142
***************
*** 5634,5637 ****
--- 5634,5638 ----
                  using namespace openvrml;
                  using std::auto_ptr;
+                 using std::ostringstream;
                  using std::string;
                  using std::vector;
***************
*** 5679,5685 ****
  
                  if (!proto_node_class) {
!                     this->scene_->browser().err
!                         << "no PROTO definition at <" << in->url() << ">"
!                         << std::endl;
                      return;
                  }
--- 5680,5686 ----
  
                  if (!proto_node_class) {
!                     ostringstream err_msg;
!                     err_msg << "no PROTO definition at <" << in->url() << ">";
!                     this->scene_->browser().err(err_msg.str());
                      return;
                  }
***************
*** 5689,5693 ****
  
              } catch (std::exception & ex) {
!                 this->scene_->browser().err << ex.what() << std::endl;
                  throw unreachable_url();
              } catch (...) {
--- 5690,5694 ----
  
              } catch (std::exception & ex) {
!                 this->scene_->browser().err(ex.what());
                  throw unreachable_url();
              } catch (...) {
***************
*** 5700,5704 ****
              }
          } catch (std::exception & ex) {
!             this->scene_->browser().err << ex.what() << std::endl;
          }
  
--- 5701,5705 ----
              }
          } catch (std::exception & ex) {
!             this->scene_->browser().err(ex.what());
          }
  
***************
*** 7492,7496 ****
  
  /**
!  * @var std::ostream & openvrml::browser::out
   *
   * @brief Output stream, generally for console output.
--- 7493,7503 ----
  
  /**
!  * @var boost::mutex openvrml::browser::out_mutex_
!  *
!  * @brief Mutex guarding @a out_.
!  */
! 
! /**
!  * @var std::ostream & openvrml::browser::out_
   *
   * @brief Output stream, generally for console output.
***************
*** 7498,7502 ****
  
  /**
!  * @var std::ostream & openvrml::browser::err
   *
   * @brief Error output stream.
--- 7505,7515 ----
  
  /**
!  * @var boost::mutex openvrml::browser::err_mutex_
!  *
!  * @brief Mutex guarding @a err_.
!  */
! 
! /**
!  * @var std::ostream & openvrml::browser::err_
   *
   * @brief Error output stream.
***************
*** 7537,7543 ****
      viewer_(0),
      modified_(false),
      frame_rate_(0.0),
-     out(out),
-     err(err),
      flags_need_updating(false)
  {
--- 7550,7556 ----
      viewer_(0),
      modified_(false),
+     out_(out),
+     err_(err),
      frame_rate_(0.0),
      flags_need_updating(false)
  {
***************
*** 8159,8172 ****
              browser.set_world(*in);
          } catch (antlr::ANTLRException & ex) {
!             browser.err << ex.getMessage() << endl;
          } catch (unreachable_url &) {
              throw;
          } catch (std::exception & ex) {
!             browser.err << ex.what() << endl;
          } catch (...) {
              throw unreachable_url();
          }
      } catch (unreachable_url & ex) {
!         this->browser_->err << ex.what() << std::endl;
      }
  
--- 8172,8185 ----
              browser.set_world(*in);
          } catch (antlr::ANTLRException & ex) {
!             browser.err(ex.getMessage());
          } catch (unreachable_url &) {
              throw;
          } catch (std::exception & ex) {
!             browser.err(ex.what());
          } catch (...) {
              throw unreachable_url();
          }
      } catch (unreachable_url & ex) {
!         this->browser_->err(ex.what());
      }
  
***************
*** 8203,8207 ****
  void openvrml::browser::description(const std::string & description)
  {
!     this->out << description << std::endl;
  }
  
--- 8216,8220 ----
  void openvrml::browser::description(const std::string & description)
  {
!     this->out(description);
  }
  
***************
*** 8284,8288 ****
              this->listener_->process_event(nodes, browser::current_time());
          } catch (std::exception & ex) {
!             this->browser_->err << ex.what() << std::endl;
              throw unreachable_url();
          } catch (...) {
--- 8297,8301 ----
              this->listener_->process_event(nodes, browser::current_time());
          } catch (std::exception & ex) {
!             this->browser_->err(ex.what());
              throw unreachable_url();
          } catch (...) {
***************
*** 8294,8298 ****
          }
      } catch (std::exception & ex) {
!         this->browser_->err << ex.what() << std::endl;
      }
  
--- 8307,8311 ----
          }
      } catch (std::exception & ex) {
!         this->browser_->err(ex.what());
      }
  
***************
*** 8702,8705 ****
--- 8715,8740 ----
  }
  
+ /**
+  * @brief Print a message to the output stream.
+  *
+  * @param[in] str   a string.
+  */
+ void openvrml::browser::out(const std::string & str)
+ {
+     boost::mutex::scoped_lock(this->out_mutex_);
+     this->out_ << str << std::endl;
+ }
+ 
+ /**
+  * @brief Print a message to the error stream.
+  *
+  * @param[in] str   a string.
+  */
+ void openvrml::browser::err(const std::string & str)
+ {
+     boost::mutex::scoped_lock(this->err_mutex_);
+     this->err_ << str << std::endl;
+ }
+ 
  
  /**
***************
*** 9015,9021 ****
              scene.load(*in);
          } catch (antlr::ANTLRException & ex) {
!             scene.browser().err << ex.getMessage() << endl;
          } catch (std::exception & ex) {
!             scene.browser().err << ex.what() << endl;
              throw unreachable_url();
          } catch (...) {
--- 9050,9056 ----
              scene.load(*in);
          } catch (antlr::ANTLRException & ex) {
!             scene.browser().err(ex.getMessage());
          } catch (std::exception & ex) {
!             scene.browser().err(ex.what());
              throw unreachable_url();
          } catch (...) {
***************
*** 9025,9029 ****
          scene.scene_loaded();
      } catch (std::exception & ex) {
!         this->scene_->browser().err << ex.what() << std::endl;
      }
  
--- 9060,9064 ----
          scene.scene_loaded();
      } catch (std::exception & ex) {
!         this->scene_->browser().err(ex.what());
      }
  
***************
*** 9293,9297 ****
              break;
          } catch (bad_url & ex) {
!             this->browser().err << ex.what() << std::endl;
              continue;
          }
--- 9328,9332 ----
              break;
          } catch (bad_url & ex) {
!             this->browser().err(ex.what());
              continue;
          }

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** browser.h	6 Mar 2006 05:58:26 -0000	1.48
--- browser.h	9 Mar 2006 05:19:17 -0000	1.49
***************
*** 245,248 ****
--- 245,254 ----
          mutable boost::mutex modified_mutex_;
  
+         mutable boost::mutex out_mutex_;
+         std::ostream & out_;
+ 
+         mutable boost::mutex err_mutex_;
+         std::ostream & err_;
+ 
      protected:
          double frame_rate_;
***************
*** 251,256 ****
          static double current_time() OPENVRML_NOTHROW;
  
-         std::ostream & out;
-         std::ostream & err;
          bool flags_need_updating;
  
--- 257,260 ----
***************
*** 336,339 ****
--- 340,346 ----
          void update_flags();
  
+         void out(const std::string & str);
+         void err(const std::string & str);
+ 
      protected:
          bool headlight_on();

Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** vrml97node.cpp	25 Feb 2006 08:37:27 -0000	1.99
--- vrml97node.cpp	9 Mar 2006 05:19:17 -0000	1.100
***************
*** 20982,20986 ****
          error = FT_Init_FreeType(&this->freeTypeLibrary);
          if (error) {
!             browser.err << "error initializing FreeType library" << std::endl;
          }
  # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
--- 20982,20986 ----
          error = FT_Init_FreeType(&this->freeTypeLibrary);
          if (error) {
!             browser.err("error initializing FreeType library");
          }
  # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
***************
*** 20996,21001 ****
          error = FT_Done_FreeType(this->freeTypeLibrary);
          if (error) {
!             this->browser().err << "error shutting down FreeType library"
!                                 << std::endl;
          }
  # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
--- 20996,21000 ----
          error = FT_Done_FreeType(this->freeTypeLibrary);
          if (error) {
!             this->browser().err("error shutting down FreeType library");
          }
  # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** script.cpp	25 Feb 2006 08:37:27 -0000	1.67
--- script.cpp	9 Mar 2006 05:19:17 -0000	1.68
***************
*** 3933,3936 ****
--- 3933,3937 ----
  {
      using std::endl;
+     using std::ostringstream;
      using std::string;
  
***************
*** 3941,3958 ****
      openvrml::browser & browser = script->script_node().scene()->browser();
  
!     string nodeId = script->script_node().id();
!     if (!nodeId.empty()) {
!         browser.err << nodeId << ": ";
      }
  
      if (errorReport) {
          if (errorReport->filename) {
!             browser.err << errorReport->filename << ": ";
          }
! 
!         browser.err << errorReport->lineno << ": ";
      }
  
!     browser.err << message << endl;
  }
  
--- 3942,3962 ----
      openvrml::browser & browser = script->script_node().scene()->browser();
  
!     ostringstream err_msg;
! 
!     const string node_id = script->script_node().id();
!     if (!node_id.empty()) {
!         err_msg << node_id << ": ";
      }
  
      if (errorReport) {
          if (errorReport->filename) {
!             err_msg << errorReport->filename << ": ";
          }
!         err_msg << errorReport->lineno << ": ";
      }
  
!     err_msg << message;
! 
!     browser.err(err_msg.str());
  }
  

[openvrml-commit] openvrml ChangeLog,1.1188,1.1189

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26027

Modified Files:
	ChangeLog 
Log Message:
Protect output and error streams associated with openvrml::browser with mutexes.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1188
retrieving revision 1.1189
diff -C2 -d -r1.1188 -r1.1189
*** ChangeLog	8 Mar 2006 22:38:59 -0000	1.1188
--- ChangeLog	9 Mar 2006 05:19:16 -0000	1.1189
***************
*** 1,3 ****
! 2006-03-07 Braden McDaniel  <br...@en...>
  
  	Added DLL build configurations to the Visual C++ 7.1 project
--- 1,38 ----
! 2006-03-08 Braden McDaniel  <br...@en...>
! 
! 	Protect output and error streams associated with openvrml::browser
! 	with mutexes.
! 
! 	* src/libopenvrml/openvrml/browser.cpp
! 	(externproto_node_class::load_proto::operator()() const): Changed
! 	to use browser::err function.
! 	(openvrml::browser::browser(std::ostream &, std::ostream &)):
! 	Initialize private out_ and err_ references.
! 	(openvrml::browser::root_scene_loader::operator()() const):
! 	Changed to use browser::err function.
! 	(openvrml::browser::description(const std::string &)): Changed to
! 	use browser::err function.
! 	(openvrml::browser::vrml_from_url_creator::operator()() const):
! 	Changed to use browser::err function.
! 	(openvrml::browser::out(const std::string &)): Added function.
! 	(openvrml::browser::err(const std::string &)): Added function.
! 	(openvrml::scene::load_scene::operator()() const): Changed to use
! 	browser::err function.
! 	(openvrml::scene::get_resource(const std::vector<std::string> &)
! 	const): Changed to use browser::err function.
! 	* src/libopenvrml/openvrml/browser.h
! 	(openvrml::browser): Made output and error members private; added
! 	mutexes to protect them; added member functions to send output to
! 	the streams.
! 	* src/libopenvrml/openvrml/script.cpp
! 	(js_::errorReporter(JSContext *, const char *, JSErrorReport *)):
! 	Changed to use openvrml::browser::err function.
! 	* src/libopenvrml/openvrml/vrml97node.cpp
! 	(text_class::text_class(openvrml::browser &)): Changed to use
! 	openvrml::browser::err function.
! 	(text_class::~text_class()): Changed to use openvrml::browser::err
! 	function.
! 
! 2006-03-08 Braden McDaniel  <br...@en...>
  
  	Added DLL build configurations to the Visual C++ 7.1 project
***************
*** 11,15 ****
  	* ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml/test-openvrml.vcproj
  
! 2006-03-07 Braden McDaniel  <br...@en...>
  
  	* src/libopenvrml/openvrml/node.h
--- 46,50 ----
  	* ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml/test-openvrml.vcproj
  
! 2006-03-08 Braden McDaniel  <br...@en...>
  
  	* src/libopenvrml/openvrml/node.h

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML OpenVRML.sln,1.4,1.5

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML

Modified Files:
	OpenVRML.sln 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: OpenVRML.sln
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/OpenVRML.sln,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OpenVRML.sln	17 Nov 2005 21:51:14 -0000	1.4
--- OpenVRML.sln	8 Mar 2006 22:39:00 -0000	1.5
***************
*** 2,5 ****
--- 2,6 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}"
  	ProjectSection(ProjectDependencies) = postProject
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63}
  	EndProjectSection
  EndProject
***************
*** 10,13 ****
--- 11,15 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}"
  	ProjectSection(ProjectDependencies) = postProject
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}
  	EndProjectSection
  EndProject
***************
*** 21,24 ****
--- 23,28 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-openvrml", "test-openvrml\test-openvrml.vcproj", "{1C9201DF-E553-422C-9CC4-E667F3C606F9}"
  	ProjectSection(ProjectDependencies) = postProject
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63}
  	EndProjectSection
  EndProject
***************
*** 26,52 ****
--- 30,78 ----
  	GlobalSection(SolutionConfiguration) = preSolution
  		Debug = Debug
+ 		Debug DLL = Debug DLL
  		Release = Release
+ 		Release DLL = Release DLL
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
  		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug.ActiveCfg = Debug|Win32
  		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug.Build.0 = Debug|Win32
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL.ActiveCfg = Debug DLL|Win32
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL.Build.0 = Debug DLL|Win32
  		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release.ActiveCfg = Release|Win32
  		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release.Build.0 = Release|Win32
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL.ActiveCfg = Release DLL|Win32
+ 		{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL.Build.0 = Release DLL|Win32
  		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug.ActiveCfg = Debug|Win32
  		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug.Build.0 = Debug|Win32
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL.ActiveCfg = Debug DLL|Win32
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL.Build.0 = Debug DLL|Win32
  		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release.ActiveCfg = Release|Win32
  		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release.Build.0 = Release|Win32
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL.ActiveCfg = Release DLL|Win32
+ 		{ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL.Build.0 = Release DLL|Win32
  		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug.ActiveCfg = Debug|Win32
  		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug.Build.0 = Debug|Win32
+ 		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL.ActiveCfg = Debug DLL|Win32
+ 		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL.Build.0 = Debug DLL|Win32
  		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release.ActiveCfg = Release|Win32
  		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release.Build.0 = Release|Win32
+ 		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL.ActiveCfg = Release DLL|Win32
+ 		{141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL.Build.0 = Release DLL|Win32
  		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug.ActiveCfg = Debug|Win32
  		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug.Build.0 = Debug|Win32
+ 		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL.ActiveCfg = Debug DLL|Win32
+ 		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL.Build.0 = Debug DLL|Win32
  		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release.ActiveCfg = Release|Win32
  		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release.Build.0 = Release|Win32
+ 		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL.ActiveCfg = Release DLL|Win32
+ 		{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL.Build.0 = Release DLL|Win32
  		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Debug.ActiveCfg = Debug|Win32
  		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Debug.Build.0 = Debug|Win32
+ 		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Debug DLL.ActiveCfg = Debug DLL|Win32
+ 		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Debug DLL.Build.0 = Debug DLL|Win32
  		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Release.ActiveCfg = Release|Win32
  		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Release.Build.0 = Release|Win32
+ 		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Release DLL.ActiveCfg = Release DLL|Win32
+ 		{1C9201DF-E553-422C-9CC4-E667F3C606F9}.Release DLL.Build.0 = Release DLL|Win32
  	EndGlobalSection
  	GlobalSection(SolutionItems) = postSolution

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml openvrml.vcproj,1.11,1.12

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml

Modified Files:
	openvrml.vcproj 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: openvrml.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** openvrml.vcproj	12 Dec 2005 17:36:19 -0000	1.11
--- openvrml.vcproj	8 Mar 2006 22:39:00 -0000	1.12
***************
*** 108,111 ****
--- 108,211 ----
  				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
+ 		<Configuration
+ 			Name="Debug DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="2"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				AdditionalOptions="/Zm400"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
+ 				PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\&quot;0.15.99\&quot;;OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="0"
+ 				RuntimeLibrary="3"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"
+ 				DisableSpecificWarnings="4226;4250;4251;4275;4290;4355;4800"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"
+ 				AdditionalIncludeDirectories="C:\cygwin\home\bmcdaniel\src\openvrml\openvrml\src\openvrml"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="2"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				AdditionalOptions="/Zm400"
+ 				Optimization="2"
+ 				InlineFunctionExpansion="1"
+ 				OmitFramePointers="TRUE"
+ 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
+ 				PreprocessorDefinitions="WIN32;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\&quot;0.15.99\&quot;;OPENVRML_BUILD_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30"
+ 				StringPooling="TRUE"
+ 				RuntimeLibrary="2"
+ 				EnableFunctionLevelLinking="TRUE"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"
+ 				DisableSpecificWarnings="4226;4250;4290;4355;4800"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"
+ 				AdditionalIncludeDirectories="C:\cygwin\home\bmcdaniel\src\openvrml\openvrml\src\openvrml"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
  	</Configurations>
  	<References>
***************
*** 173,176 ****
--- 273,290 ----
  						EnableFunctionLevelLinking="FALSE"/>
  				</FileConfiguration>
+ 				<FileConfiguration
+ 					Name="Debug DLL|Win32">
+ 					<Tool
+ 						Name="VCCLCompilerTool"
+ 						MinimalRebuild="FALSE"
+ 						DebugInformationFormat="2"/>
+ 				</FileConfiguration>
+ 				<FileConfiguration
+ 					Name="Release DLL|Win32">
+ 					<Tool
+ 						Name="VCCLCompilerTool"
+ 						Optimization="0"
+ 						EnableFunctionLevelLinking="FALSE"/>
+ 				</FileConfiguration>
  			</File>
  		</Filter>

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml test-openvrml.vcproj,1.1,1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml

Modified Files:
	test-openvrml.vcproj 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: test-openvrml.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml/test-openvrml.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test-openvrml.vcproj	17 Nov 2005 21:51:14 -0000	1.1
--- test-openvrml.vcproj	8 Mar 2006 22:39:01 -0000	1.2
***************
*** 65,70 ****
  			<Tool
  				Name="VCCLCompilerTool"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
! 				RuntimeLibrary="4"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
--- 65,71 ----
  			<Tool
  				Name="VCCLCompilerTool"
! 				AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_USE_LIB"
! 				RuntimeLibrary="2"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
***************
*** 95,98 ****
--- 96,186 ----
  				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
+ 		<Configuration
+ 			Name="Debug DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="2"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OPENVRML_USE_DLL"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="3"
+ 				RuntimeLibrary="3"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"
+ 				DisableSpecificWarnings="4250;4290;4355"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="2"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENVRML_USE_DLL"
+ 				RuntimeLibrary="2"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
  	</Configurations>
  	<References>

[openvrml-commit] openvrml ChangeLog,1.1187,1.1188

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916

Modified Files:
	ChangeLog 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -C2 -d -r1.1187 -r1.1188
*** ChangeLog	8 Mar 2006 20:06:34 -0000	1.1187
--- ChangeLog	8 Mar 2006 22:38:59 -0000	1.1188
***************
*** 1,4 ****
--- 1,16 ----
  2006-03-07 Braden McDaniel  <br...@en...>
  
+ 	Added DLL build configurations to the Visual C++ 7.1 project
+ 	files.
+ 
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/OpenVRML.sln
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/antlr/antlr.vcproj
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/openvrml/openvrml.vcproj
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer/sdl-viewer.vcproj
+ 	* ide-projects/Windows/VisualC7_1/OpenVRML/test-openvrml/test-openvrml.vcproj
+ 
+ 2006-03-07 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/node.h
  	(openvrml::node_cast<To>(node *)): Removed OPENVRML_API macro.

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/antlr antlr.vcproj,1.4,1.5

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/antlr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML/antlr

Modified Files:
	antlr.vcproj 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: antlr.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/antlr/antlr.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** antlr.vcproj	17 Nov 2005 21:51:14 -0000	1.4
--- antlr.vcproj	8 Mar 2006 22:39:00 -0000	1.5
***************
*** 102,105 ****
--- 102,195 ----
  				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
+ 		<Configuration
+ 			Name="Debug DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="4"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories="..\..\..\..\..\lib\antlr"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="0"
+ 				RuntimeLibrary="3"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"
+ 				DisableSpecificWarnings="4231;4355"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLibrarianTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="4"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="2"
+ 				InlineFunctionExpansion="1"
+ 				OmitFramePointers="TRUE"
+ 				AdditionalIncludeDirectories="..\..\..\..\..\lib\antlr"
+ 				PreprocessorDefinitions="NDEBUG"
+ 				StringPooling="TRUE"
+ 				RuntimeLibrary="2"
+ 				EnableFunctionLevelLinking="TRUE"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLibrarianTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
  	</Configurations>
  	<References>

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl openvrml-gl.vcproj,1.5,1.6

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl

Modified Files:
	openvrml-gl.vcproj 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: openvrml-gl.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** openvrml-gl.vcproj	17 Nov 2005 21:51:14 -0000	1.5
--- openvrml-gl.vcproj	8 Mar 2006 22:39:00 -0000	1.6
***************
*** 105,108 ****
--- 105,203 ----
  				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
+ 		<Configuration
+ 			Name="Debug DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="4"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories=".;&quot;..\..\..\..\..\src\libopenvrml-gl&quot;;..\openvrml;..\..\..\..\..\src\libopenvrml"
+ 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="0"
+ 				RuntimeLibrary="3"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"
+ 				DisableSpecificWarnings="4099;4250;4251;4275;4290;4800"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLibrarianTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"
+ 				AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="2"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="2"
+ 				InlineFunctionExpansion="1"
+ 				OmitFramePointers="TRUE"
+ 				AdditionalIncludeDirectories="&quot;..\..\..\..\..\src\libopenvrml-gl&quot;;..\..\..\..\..\src\libopenvrml;..\openvrml;."
+ 				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL"
+ 				StringPooling="TRUE"
+ 				RuntimeLibrary="2"
+ 				EnableFunctionLevelLinking="TRUE"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"
+ 				DisableSpecificWarnings="4099;4250;4290;4800"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
  	</Configurations>
  	<References>

[openvrml-commit] openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer sdl-viewer.vcproj,1.3,1.4

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30916/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer

Modified Files:
	sdl-viewer.vcproj 
Log Message:
Added DLL build configurations to the Visual C++ 7.1 project files.

Index: sdl-viewer.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC7_1/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sdl-viewer.vcproj	17 Nov 2005 21:51:14 -0000	1.3
--- sdl-viewer.vcproj	8 Mar 2006 22:39:01 -0000	1.4
***************
*** 118,121 ****
--- 118,228 ----
  				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
+ 		<Configuration
+ 			Name="Debug DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="1"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				AdditionalOptions="/VERBOSE:LIB"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml;&quot;..\openvrml-gl&quot;;&quot;..\..\..\..\..\src\libopenvrml-gl&quot;"
+ 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OPENVRML_USE_LIB;OPENVRML_GL_USE_LIB"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="0"
+ 				RuntimeLibrary="3"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"
+ 				DisableSpecificWarnings="4250;4290;4355"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib"
+ 				OutputFile="$(OutDir)/sdl-viewer.exe"
+ 				LinkIncremental="2"
+ 				GenerateDebugInformation="TRUE"
+ 				ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb"
+ 				SubSystem="2"
+ 				TargetMachine="1"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release DLL|Win32"
+ 			OutputDirectory="$(ConfigurationName)"
+ 			IntermediateDirectory="$(ConfigurationName)"
+ 			ConfigurationType="1"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml;&quot;..\..\..\..\..\src\libopenvrml-gl&quot;;..\openvrml;&quot;..\openvrml-gl&quot;"
+ 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL"
+ 				RuntimeLibrary="2"
+ 				TreatWChar_tAsBuiltInType="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="3"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"
+ 				DisableSpecificWarnings="4226;4250;4290;4355;4800"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib"
+ 				OutputFile="$(OutDir)/sdl-viewer.exe"
+ 				LinkIncremental="1"
+ 				GenerateDebugInformation="TRUE"
+ 				SubSystem="2"
+ 				OptimizeReferences="2"
+ 				EnableCOMDATFolding="2"
+ 				TargetMachine="1"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
  	</Configurations>
  	<References>