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

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.215, 1.216

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

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

Modified Files:
	browser.cpp 
Log Message:
Ensure the scene's URL is relative before trying to resolve it against that of the parent scene.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** browser.cpp	25 May 2007 06:13:06 -0000	1.215
--- browser.cpp	31 May 2007 07:18:55 -0000	1.216
***************
*** 7229,7237 ****
      read_write_mutex::scoped_read_lock lock(this->url_mutex_);
      using std::string;
!     const string result = (this->parent_ && !this->url_.empty())
!                         ? string(uri(this->url_)
!                                  .resolve_against(uri(this->parent_->url())))
!                         : this->url_;
!     return result;
  }
  
--- 7229,7235 ----
      read_write_mutex::scoped_read_lock lock(this->url_mutex_);
      using std::string;
!     return (this->parent_ && !this->url_.empty() && relative(uri(this->url_)))
!         ? string(uri(this->url_).resolve_against(uri(this->parent_->url())))
!         : this->url_;
  }
  

[openvrml-commit] openvrml ChangeLog,1.1510,1.1511

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

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

Modified Files:
	ChangeLog 
Log Message:
Ensure the scene's URL is relative before trying to resolve it against that of the parent scene.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -C2 -d -r1.1510 -r1.1511
*** ChangeLog	25 May 2007 06:13:03 -0000	1.1510
--- ChangeLog	31 May 2007 07:18:54 -0000	1.1511
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-05-31 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::scene::url() const): Ensure the scene's URL is relative
+ 	before trying to resolve it against that of the parent scene.
+ 
  2007-05-25 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.190.2.15, 1.190.2.16

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	browser.cpp 
Log Message:
Ensure the scene's URL is relative before trying to resolve it against that of the parent scene.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.190.2.15
retrieving revision 1.190.2.16
diff -C2 -d -r1.190.2.15 -r1.190.2.16
*** browser.cpp	27 Apr 2007 06:58:26 -0000	1.190.2.15
--- browser.cpp	31 May 2007 07:18:17 -0000	1.190.2.16
***************
*** 7122,7130 ****
      boost::mutex::scoped_lock lock(this->url_mutex_);
      using std::string;
!     const string result = (this->parent_ && !this->url_.empty())
!                         ? string(uri(this->url_)
!                                  .resolve_against(uri(this->parent_->url())))
!                         : this->url_;
!     return result;
  }
  
--- 7122,7128 ----
      boost::mutex::scoped_lock lock(this->url_mutex_);
      using std::string;
!     return (this->parent_ && !this->url_.empty() && relative(uri(this->url_)))
!         ? string(uri(this->url_).resolve_against(uri(this->parent_->url())))
!         : this->url_;
  }
  

[openvrml-commit] openvrml ChangeLog,1.1310.2.175,1.1310.2.176

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Ensure the scene's URL is relative before trying to resolve it against that of the parent scene.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.175
retrieving revision 1.1310.2.176
diff -C2 -d -r1.1310.2.175 -r1.1310.2.176
*** ChangeLog	21 May 2007 06:36:48 -0000	1.1310.2.175
--- ChangeLog	31 May 2007 07:18:16 -0000	1.1310.2.176
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-05-31 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::scene::url() const): Ensure the scene's URL is relative
+ 	before trying to resolve it against that of the parent scene.
+ 
  2007-05-21 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.214, 1.215 browser.h, 1.69, 1.70

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

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

Modified Files:
	browser.cpp browser.h 
Log Message:
Protect browser::load_root_scene_thread_ with a read-write mutex.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** browser.cpp	21 May 2007 03:37:01 -0000	1.214
--- browser.cpp	25 May 2007 06:13:06 -0000	1.215
***************
*** 5385,5388 ****
--- 5385,5396 ----
   * @internal
   *
+  * @var openvrml::read_write_mutex openvrml::browser::load_root_scene_thread_mutex_
+  *
+  * @brief Mutex protecting @c #load_root_scene_thread_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var boost::scoped_ptr<boost::thread> openvrml::browser::load_root_scene_thread_
   *
***************
*** 5769,5775 ****
--- 5777,5786 ----
  openvrml::browser::~browser() OPENVRML_NOTHROW
  {
+     read_write_mutex::scoped_read_lock
+         lock(this->load_root_scene_thread_mutex_);
      if (this->load_root_scene_thread_) {
          this->load_root_scene_thread_->join();
      }
+ 
      this->load_proto_thread_group_.join_all();
  
***************
*** 6285,6292 ****
      OPENVRML_THROW2(std::bad_alloc, boost::thread_resource_error)
  {
!     if (this->load_root_scene_thread_) {
!         this->load_root_scene_thread_->join();
      }
      boost::function0<void> f = root_scene_loader(*this, url);
      this->load_root_scene_thread_.reset(new boost::thread(f));
  }
--- 6296,6311 ----
      OPENVRML_THROW2(std::bad_alloc, boost::thread_resource_error)
  {
!     {
!         read_write_mutex::scoped_read_lock
!             lock(this->load_root_scene_thread_mutex_);
!         if (this->load_root_scene_thread_) {
!             this->load_root_scene_thread_->join();
!         }
      }
+ 
      boost::function0<void> f = root_scene_loader(*this, url);
+ 
+     read_write_mutex::scoped_write_lock
+         lock(this->load_root_scene_thread_mutex_);
      this->load_root_scene_thread_.reset(new boost::thread(f));
  }

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** browser.h	21 May 2007 03:37:01 -0000	1.69
--- browser.h	25 May 2007 06:13:07 -0000	1.70
***************
*** 230,234 ****
--- 230,237 ----
          const boost::scoped_ptr<null_node_metatype> null_node_metatype_;
          const boost::scoped_ptr<null_node_type> null_node_type_;
+ 
+         read_write_mutex load_root_scene_thread_mutex_;
          boost::scoped_ptr<boost::thread> load_root_scene_thread_;
+ 
          boost::thread_group load_proto_thread_group_;
          node_metatype_map node_metatype_map_;

[openvrml-commit] openvrml ChangeLog,1.1509,1.1510

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

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

Modified Files:
	ChangeLog 
Log Message:
Protect browser::load_root_scene_thread_ with a read-write mutex.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -C2 -d -r1.1509 -r1.1510
*** ChangeLog	21 May 2007 06:37:03 -0000	1.1509
--- ChangeLog	25 May 2007 06:13:03 -0000	1.1510
***************
*** 1,2 ****
--- 1,15 ----
+ 2007-05-25 Braden McDaniel  <br...@en...>
+ 
+ 	Protect browser::load_root_scene_thread_ with a read-write mutex.
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::browser::~browser()): Lock the
+ 	load_root_scene_thread_mutex_ for reading.
+ 	(openvrml::browser::load_url(const std::vector<std::string> &,
+ 	const std::vector<std::string> &)): Lock the
+ 	load_root_scene_thread_mutex_.
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::browser): Added member load_root_scene_thread_mutex_.
+ 
  2007-05-21 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.23, 1.24

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32417/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Fall out of the loop if we get a linefeed even if there is additional input; any additional input would be associated with an additional request.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** player.cpp	5 May 2007 06:09:06 -0000	1.23
--- player.cpp	21 May 2007 06:37:04 -0000	1.24
***************
*** 701,705 ****
          if (c != '\n') { req_data.request_line.put(c); }
          error_guard.dismiss();
!     } while (g_io_channel_get_buffer_condition(source) & G_IO_IN);
  
      if (c == '\n') {
--- 701,706 ----
          if (c != '\n') { req_data.request_line.put(c); }
          error_guard.dismiss();
!     } while (g_io_channel_get_buffer_condition(source) & G_IO_IN
!              && c != '\n');
  
      if (c == '\n') {

[openvrml-commit] openvrml ChangeLog,1.1508,1.1509

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

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

Modified Files:
	ChangeLog 
Log Message:
Fall out of the loop if we get a linefeed even if there is additional input; any additional input would be associated with an additional request.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -C2 -d -r1.1508 -r1.1509
*** ChangeLog	21 May 2007 04:19:24 -0000	1.1508
--- ChangeLog	21 May 2007 06:37:03 -0000	1.1509
***************
*** 1,4 ****
--- 1,12 ----
  2007-05-21 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-player/player.cpp
+ 	(openvrml_player_request_data_available(GIOChannel *,
+ 	GIOCondition, gpointer)): Fall out of the loop if we get a
+ 	linefeed even if there is additional input; any additional input
+ 	would be associated with an additional request.
+ 
+ 2007-05-21 Braden McDaniel  <br...@en...>
+ 
  	* tests/Makefile.am: Applied BOOST_LIB_SUFFIX to uses of
  	-lboost_unit_test_framework.

[openvrml-commit] openvrml ChangeLog,1.1310.2.174,1.1310.2.175

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Fall out of the loop if we get a linefeed even if there is additional input; any additional input would be associated with an additional request.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.174
retrieving revision 1.1310.2.175
diff -C2 -d -r1.1310.2.174 -r1.1310.2.175
*** ChangeLog	21 May 2007 04:19:10 -0000	1.1310.2.174
--- ChangeLog	21 May 2007 06:36:48 -0000	1.1310.2.175
***************
*** 1,4 ****
--- 1,12 ----
  2007-05-21 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-player/player.cpp
+ 	(openvrml_player_request_data_available(GIOChannel *,
+ 	GIOCondition, gpointer)): Fall out of the loop if we get a
+ 	linefeed even if there is additional input; any additional input
+ 	would be associated with an additional request.
+ 
+ 2007-05-21 Braden McDaniel  <br...@en...>
+ 
  	* tests/Makefile.am: Applied BOOST_LIB_SUFFIX to uses of
  	-lboost_unit_test_framework.

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.22, 1.1.2.23

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32394/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Fall out of the loop if we get a linefeed even if there is additional input; any additional input would be associated with an additional request.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -C2 -d -r1.1.2.22 -r1.1.2.23
*** player.cpp	5 May 2007 06:07:16 -0000	1.1.2.22
--- player.cpp	21 May 2007 06:36:48 -0000	1.1.2.23
***************
*** 701,705 ****
          if (c != '\n') { req_data.request_line.put(c); }
          error_guard.dismiss();
!     } while (g_io_channel_get_buffer_condition(source) & G_IO_IN);
  
      if (c == '\n') {
--- 701,706 ----
          if (c != '\n') { req_data.request_line.put(c); }
          error_guard.dismiss();
!     } while (g_io_channel_get_buffer_condition(source) & G_IO_IN
!              && c != '\n');
  
      if (c == '\n') {

[openvrml-commit] openvrml/tests Makefile.am,1.16,1.17

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

Update of /cvsroot/openvrml/openvrml/tests
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10634/tests

Modified Files:
	Makefile.am 
Log Message:
Applied BOOST_LIB_SUFFIX to uses of -lboost_unit_test_framework.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am	22 Nov 2006 00:05:19 -0000	1.16
--- Makefile.am	21 May 2007 04:19:24 -0000	1.17
***************
*** 25,47 ****
  color_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  rotation_SOURCES = rotation.cpp
  rotation_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  mat4f_SOURCES = mat4f.cpp
  mat4f_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  image_SOURCES = image.cpp
  image_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  browser_SOURCES = browser.cpp
! browser_LDADD = libtest-openvrml.la -lboost_unit_test_framework -lboost_filesystem
  
  parse_anchor_SOURCES = parse_anchor.cpp
--- 25,50 ----
  color_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  rotation_SOURCES = rotation.cpp
  rotation_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  mat4f_SOURCES = mat4f.cpp
  mat4f_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  image_SOURCES = image.cpp
  image_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  browser_SOURCES = browser.cpp
! browser_LDADD = \
!         libtest-openvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX) \
!         -lboost_filesystem$(BOOST_LIB_SUFFIX)
  
  parse_anchor_SOURCES = parse_anchor.cpp
***************
*** 51,60 ****
  node_interface_set_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  node_metatype_id_SOURCES = node_metatype_id.cpp
  node_metatype_id_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  parse_vrml97_SOURCES = parse_vrml97.cpp
--- 54,63 ----
  node_interface_set_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  node_metatype_id_SOURCES = node_metatype_id.cpp
  node_metatype_id_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  parse_vrml97_SOURCES = parse_vrml97.cpp

[openvrml-commit] openvrml ChangeLog,1.1507,1.1508

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

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

Modified Files:
	ChangeLog 
Log Message:
Applied BOOST_LIB_SUFFIX to uses of -lboost_unit_test_framework.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -C2 -d -r1.1507 -r1.1508
*** ChangeLog	21 May 2007 04:12:35 -0000	1.1507
--- ChangeLog	21 May 2007 04:19:24 -0000	1.1508
***************
*** 1,4 ****
--- 1,9 ----
  2007-05-21 Braden McDaniel  <br...@en...>
  
+ 	* tests/Makefile.am: Applied BOOST_LIB_SUFFIX to uses of
+ 	-lboost_unit_test_framework.
+ 
+ 2007-05-21 Braden McDaniel  <br...@en...>
+ 
  	* configure.ac: Added check to ensure
  	libboost_thread$BOOST_LIB_SUFFIX is usable.

[openvrml-commit] openvrml ChangeLog,1.1310.2.173,1.1310.2.174

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Applied BOOST_LIB_SUFFIX to uses of -lboost_unit_test_framework.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.173
retrieving revision 1.1310.2.174
diff -C2 -d -r1.1310.2.173 -r1.1310.2.174
*** ChangeLog	21 May 2007 04:11:58 -0000	1.1310.2.173
--- ChangeLog	21 May 2007 04:19:10 -0000	1.1310.2.174
***************
*** 1,4 ****
--- 1,9 ----
  2007-05-21 Braden McDaniel  <br...@en...>
  
+ 	* tests/Makefile.am: Applied BOOST_LIB_SUFFIX to uses of
+ 	-lboost_unit_test_framework.
+ 
+ 2007-05-21 Braden McDaniel  <br...@en...>
+ 
  	* configure.ac: Added check to ensure
  	libboost_thread$BOOST_LIB_SUFFIX is usable.

[openvrml-commit] openvrml/tests Makefile.am,1.14.2.1,1.14.2.2

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

Update of /cvsroot/openvrml/openvrml/tests
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10586/tests

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	Makefile.am 
Log Message:
Applied BOOST_LIB_SUFFIX to uses of -lboost_unit_test_framework.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/tests/Makefile.am,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** Makefile.am	23 Aug 2006 06:49:49 -0000	1.14.2.1
--- Makefile.am	21 May 2007 04:19:11 -0000	1.14.2.2
***************
*** 25,47 ****
  color_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  rotation_SOURCES = rotation.cpp
  rotation_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  mat4f_SOURCES = mat4f.cpp
  mat4f_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  image_SOURCES = image.cpp
  image_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  browser_SOURCES = browser.cpp
! browser_LDADD = libtest-openvrml.la -lboost_unit_test_framework -lboost_filesystem
  
  parse_anchor_SOURCES = parse_anchor.cpp
--- 25,50 ----
  color_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  rotation_SOURCES = rotation.cpp
  rotation_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  mat4f_SOURCES = mat4f.cpp
  mat4f_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  image_SOURCES = image.cpp
  image_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  browser_SOURCES = browser.cpp
! browser_LDADD = \
!         libtest-openvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX) \
!         -lboost_filesystem$(BOOST_LIB_SUFFIX)
  
  parse_anchor_SOURCES = parse_anchor.cpp
***************
*** 51,60 ****
  node_interface_set_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  node_metatype_id_SOURCES = node_metatype_id.cpp
  node_metatype_id_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework
  
  parse_vrml97_SOURCES = parse_vrml97.cpp
--- 54,63 ----
  node_interface_set_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  node_metatype_id_SOURCES = node_metatype_id.cpp
  node_metatype_id_LDADD = \
          $(top_builddir)/src/libopenvrml/libopenvrml.la \
!         -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
  
  parse_vrml97_SOURCES = parse_vrml97.cpp

[openvrml-commit] openvrml ChangeLog, 1.1506, 1.1507 configure.ac, 1.113, 1.114

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

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Added check to ensure libboost_thread is usable.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** configure.ac	30 Apr 2007 07:37:25 -0000	1.113
--- configure.ac	21 May 2007 04:12:35 -0000	1.114
***************
*** 81,84 ****
--- 81,104 ----
  ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
  
+ #
+ # Allow users to specify any Boost library name suffix
+ #
+ AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix])
+ 
+ AC_CACHE_CHECK([for boost_thread$BOOST_LIB_SUFFIX library],
+ [ov_cv_boost_thread],
+ [ov_cv_boost_thread=no
+ ov_save_LIBS=$LIBS
+ LIBS="-lboost_thread$BOOST_LIB_SUFFIX $LIBS"
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/thread.hpp>]],
+                                 [[boost::thread t]])],
+                [ov_cv_boost_thread=yes])
+ AC_LANG_POP
+ LIBS=$ov_save_LIBS
+ ])
+ AS_IF([test X$ov_cv_boost_thread = Xno],
+       [AC_MSG_FAILURE([libboost_thread$BOOST_LIB_SUFFIX not found])])
+ 
  PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
  PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
***************
*** 151,159 ****
  
  #
- # Allow users to specify any Boost library name suffix
- #
- AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix])
- 
- #
  # Use exception specifications?
  #
--- 171,174 ----

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1506
retrieving revision 1.1507
diff -C2 -d -r1.1506 -r1.1507
*** ChangeLog	21 May 2007 03:37:00 -0000	1.1506
--- ChangeLog	21 May 2007 04:12:35 -0000	1.1507
***************
*** 1,2 ****
--- 1,7 ----
+ 2007-05-21 Braden McDaniel  <br...@en...>
+ 
+ 	* configure.ac: Added check to ensure
+ 	libboost_thread$BOOST_LIB_SUFFIX is usable.
+ 
  2007-05-20 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml ChangeLog, 1.1310.2.172, 1.1310.2.173 configure.ac, 1.92.2.21, 1.92.2.22

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog configure.ac 
Log Message:
Added check to ensure libboost_thread is usable.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.21
retrieving revision 1.92.2.22
diff -C2 -d -r1.92.2.21 -r1.92.2.22
*** configure.ac	30 Apr 2007 07:37:08 -0000	1.92.2.21
--- configure.ac	21 May 2007 04:11:59 -0000	1.92.2.22
***************
*** 81,84 ****
--- 81,104 ----
  ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
  
+ #
+ # Allow users to specify any Boost library name suffix
+ #
+ AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix])
+ 
+ AC_CACHE_CHECK([for boost_thread$BOOST_LIB_SUFFIX library],
+ [ov_cv_boost_thread],
+ [ov_cv_boost_thread=no
+ ov_save_LIBS=$LIBS
+ LIBS="-lboost_thread$BOOST_LIB_SUFFIX $LIBS"
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/thread.hpp>]],
+                                 [[boost::thread t]])],
+                [ov_cv_boost_thread=yes])
+ AC_LANG_POP
+ LIBS=$ov_save_LIBS
+ ])
+ AS_IF([test X$ov_cv_boost_thread = Xno],
+       [AC_MSG_FAILURE([libboost_thread$BOOST_LIB_SUFFIX not found])])
+ 
  PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
  PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
***************
*** 151,159 ****
  
  #
- # Allow users to specify any Boost library name suffix
- #
- AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix])
- 
- #
  # Use exception specifications?
  #
--- 171,174 ----

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.172
retrieving revision 1.1310.2.173
diff -C2 -d -r1.1310.2.172 -r1.1310.2.173
*** ChangeLog	17 May 2007 07:17:44 -0000	1.1310.2.172
--- ChangeLog	21 May 2007 04:11:58 -0000	1.1310.2.173
***************
*** 1,17378 ****
! 2007-05-17 Braden McDaniel  <br...@en...>
! 
! 	Visual C++ 8.0 project file updates.
! 
! 	* ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln: Removed
! 	sdl-viewer dependency on antlr.  openvrml's dependency on antlr
! 	should be sufficient.
! 	* ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj:
! 	Added gdi32.lib, advapi32.lib, shell32.lib as additional
! 	dependencies--Visual C++ Express seems to need these, though the
[...34732 lines suppressed...]
! 	Removed win32Lookat.  This, too, belongs in its own package. But
! 	I'll leave the specifics of that package to the Win32 developers.
! 
! 	Removed the javascript subtree and added a newer version of libjs
! 	to src/vrml97/libjs, and incorporated it into the automake build.
! 
! 	Nuked the OLD directory.  These build scripts certainly would need
! 	a good deal of reworking after the reorg I've done, and hopefully
! 	the use of automake means they are nolonger necessary.  If anyone
! 	needs they can be found in an older tarball.
! 
! 1999-10-17  Braden N. McDaniel  <br...@en...>
! 
! 	OpenGL renderer displaced from libvrml97core and placed in
! 	libvrml97gl.
! 
! 	Helper functions from MathHelper.cpp in libvrml97core placed in an
! 	unnamed namespace in ViewerOpenGL.cpp.
! 
! 	OpenGLEvent.c renamed to OpenGLEvent.cpp.

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.213, 1.214 browser.h, 1.68, 1.69

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

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

Modified Files:
	browser.cpp browser.h 
Log Message:
Replaced the browser-wide recursive mutex with several read-write mutexes.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** browser.cpp	15 May 2007 04:06:11 -0000	1.213
--- browser.cpp	21 May 2007 03:37:01 -0000	1.214
***************
*** 5062,5066 ****
  
  /**
!  * @var openvrml::browser::Vrml97Parser
   *
   * @brief VRML97 parser generated by ANTLR.
--- 5062,5072 ----
  
  /**
!  * @var class openvrml::browser::scene
!  *
!  * @brief The scene.
!  */
! 
! /**
!  * @var class openvrml::browser::Vrml97Parser
   *
   * @brief VRML97 parser generated by ANTLR.
***************
*** 5068,5072 ****
  
  /**
!  * @var openvrml::browser::X3DVrmlParser
   *
   * @brief X3D VRML parser generated by ANTLR.
--- 5074,5078 ----
  
  /**
!  * @var class openvrml::browser::X3DVrmlParser
   *
   * @brief X3D VRML parser generated by ANTLR.
***************
*** 5416,5419 ****
--- 5422,5442 ----
   * @internal
   *
+  * @var openvrml::resource_fetcher & openvrml::browser::fetcher_
+  *
+  * @brief A reference to the @c resource_fetcher associated with the
+  *        @c browser.
+  */
+ 
+ /**
+  * @internal
+  *
+  * @var openvrml::read_write_mutex openvrml::browser::scene_mutex_
+  *
+  * @brief Mutex protecting @c #scene_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var openvrml::scene * openvrml::browser::scene_
   *
***************
*** 5433,5436 ****
--- 5456,5467 ----
   * @internal
   *
+  * @var openvrml::read_write_mutex openvrml::browser::active_viewpoint_mutex_
+  *
+  * @brief Mutex protecting @c #active_viewpoint_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var openvrml::viewpoint_node * openvrml::browser::active_viewpoint_
   *
***************
*** 5450,5453 ****
--- 5481,5492 ----
   * @internal
   *
+  * @var openvrml::read_write_mutex openvrml::browser::active_navigation_info_mutex_
+  *
+  * @brief Mutex protecting @c #active_navigation_info_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var openvrml::navigation_info_node * openvrml::browser::active_navigation_info_
   *
***************
*** 5458,5462 ****
   * @internal
   *
!  * @var std::list<openvrml::viewpoint_node *> openvrml::browser::viewpoint_list
   *
   * @brief A list of all the Viewpoint @c node%s in the @c browser.
--- 5497,5509 ----
   * @internal
   *
!  * @var openvrml::read_write_mutex openvrml::browser::viewpoint_list_mutex_
!  *
!  * @brief Mutex protecting @c #viewpoint_list_.
!  */
! 
! /**
!  * @internal
!  *
!  * @var std::list<openvrml::viewpoint_node *> openvrml::browser::viewpoint_list_
   *
   * @brief A list of all the Viewpoint @c node%s in the @c browser.
***************
*** 5466,5470 ****
   * @internal
   *
!  * @var std::list<openvrml::node *> openvrml::browser::scoped_lights
   *
   * @brief A list of all the scoped light @c node%s in the @c browser.
--- 5513,5525 ----
   * @internal
   *
!  * @var openvrml::read_write_mutex openvrml::browser::scoped_lights_mutex_
!  *
!  * @brief Mutex protecting @c #scoped_lights_.
!  */
! 
! /**
!  * @internal
!  *
!  * @var std::list<openvrml::node *> openvrml::browser::scoped_lights_
   *
   * @brief A list of all the scoped light @c node%s in the @c browser.
***************
*** 5474,5478 ****
   * @internal
   *
!  * @var std::list<openvrml::script_node *> openvrml::browser::scripts
   *
   * @brief A list of all the Script @c node%s in the @c browser.
--- 5529,5541 ----
   * @internal
   *
!  * @var openvrml::read_write_mutex openvrml::browser::scripts_mutex_
!  *
!  * @brief Mutex protecting @c #scripts_.
!  */
! 
! /**
!  * @internal
!  *
!  * @var std::list<openvrml::script_node *> openvrml::browser::scripts_
   *
   * @brief A list of all the Script @c node%s in the @c browser.
***************
*** 5482,5486 ****
   * @internal
   *
!  * @var std::list<openvrml::time_dependent_node *> openvrml::browser::timers
   *
   * @brief A list of all the TimeSensor @c node%s in the @c browser.
--- 5545,5557 ----
   * @internal
   *
!  * @var openvrml::read_write_mutex openvrml::browser::timers_mutex_
!  *
!  * @brief Mutex protecting @c #timers_.
!  */
! 
! /**
!  * @internal
!  *
!  * @var std::list<openvrml::time_dependent_node *> openvrml::browser::timers_
   *
   * @brief A list of all the TimeSensor @c node%s in the @c browser.
***************
*** 5520,5523 ****
--- 5591,5596 ----
  
  /**
+  * @internal
+  *
   * @var bool openvrml::browser::new_view
   *
***************
*** 5526,5529 ****
--- 5599,5612 ----
  
  /**
+  * @internal
+  *
+  * @var openvrml::read_write_mutex openvrml::browser::delta_time_mutex_
+  *
+  * @brief Mutex protecting @c #delta_time.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var double openvrml::browser::delta_time
   *
***************
*** 5532,5535 ****
--- 5615,5628 ----
  
  /**
+  * @internal
+  *
+  * @var openvrml::read_write_mutex openvrml::browser::viewer_mutex_
+  *
+  * @brief Mutex protecting @c #viewer_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var openvrml::openvrml::viewer * openvrml::browser::viewer_
   *
***************
*** 5538,5541 ****
--- 5631,5644 ----
  
  /**
+  * @internal
+  *
+  * @var openvrml::read_write_mutex openvrml::browser::frame_rate_mutex_
+  *
+  * @brief Mutex protecting @c #frame_rate_.
+  */
+ 
+ /**
+  * @internal
+  *
   * @var double openvrml::browser::frame_rate_
   *
***************
*** 5640,5643 ****
--- 5743,5747 ----
      null_node_type_(new null_node_type(*null_node_metatype_)),
      script_node_metatype_(*this),
+     fetcher_(fetcher),
      scene_(new scene(*this)),
      default_viewpoint_(new default_viewpoint(*null_node_type_)),
***************
*** 5650,5657 ****
      viewer_(0),
      modified_(false),
!     fetcher_(fetcher),
      out_(&out),
      err_(&err),
-     frame_rate_(0.0),
      flags_need_updating(false)
  {
--- 5754,5760 ----
      viewer_(0),
      modified_(false),
!     frame_rate_(0.0),
      out_(&out),
      err_(&err),
      flags_need_updating(false)
  {
***************
*** 5673,5683 ****
      const double now = browser::current_time();
  
      if (this->scene_) { this->scene_->shutdown(now); }
  
      this->node_metatype_map_.shutdown(now);
!     assert(this->viewpoint_list.empty());
!     assert(this->scoped_lights.empty());
!     assert(this->scripts.empty());
!     assert(this->timers.empty());
  }
  
--- 5776,5787 ----
      const double now = browser::current_time();
  
+     read_write_mutex::scoped_read_lock scene_lock(this->scene_mutex_);
      if (this->scene_) { this->scene_->shutdown(now); }
  
      this->node_metatype_map_.shutdown(now);
!     assert(this->viewpoint_list_.empty());
!     assert(this->scoped_lights_.empty());
!     assert(this->scripts_.empty());
!     assert(this->timers_.empty());
  }
  
***************
*** 5733,5737 ****
  openvrml::scene * openvrml::browser::root_scene() const OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return this->scene_.get();
  }
--- 5837,5841 ----
  openvrml::scene * openvrml::browser::root_scene() const OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
      return this->scene_.get();
  }
***************
*** 5751,5755 ****
      OPENVRML_THROW1(std::bad_alloc)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      assert(this->scene_);
  
--- 5855,5859 ----
      OPENVRML_THROW1(std::bad_alloc)
  {
!     read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
      assert(this->scene_);
  
***************
*** 5797,5801 ****
      OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return *this->active_viewpoint_;
  }
--- 5901,5905 ----
      OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_read_lock lock(this->active_viewpoint_mutex_);
      return *this->active_viewpoint_;
  }
***************
*** 5809,5813 ****
      OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      this->active_viewpoint_ = &viewpoint;
  }
--- 5913,5917 ----
      OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_write_lock lock(this->active_viewpoint_mutex_);
      this->active_viewpoint_ = &viewpoint;
  }
***************
*** 5818,5822 ****
  void openvrml::browser::reset_default_viewpoint() OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      assert(this->default_viewpoint_);
      this->active_viewpoint_ =
--- 5922,5926 ----
  void openvrml::browser::reset_default_viewpoint() OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_write_lock lock(this->active_viewpoint_mutex_);
      assert(this->default_viewpoint_);
      this->active_viewpoint_ =
***************
*** 5836,5840 ****
  openvrml::browser::active_navigation_info() const OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return *this->active_navigation_info_;
  }
--- 5940,5945 ----
  openvrml::browser::active_navigation_info() const OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_read_lock
!         lock(this->active_navigation_info_mutex_);
      return *this->active_navigation_info_;
  }
***************
*** 5848,5852 ****
      OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      this->active_navigation_info_ = &nav_info;
  }
--- 5953,5958 ----
      OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_write_lock
!         lock(this->active_navigation_info_mutex_);
      this->active_navigation_info_ = &nav_info;
  }
***************
*** 5857,5861 ****
  void openvrml::browser::reset_default_navigation_info() OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      assert(this->default_navigation_info_);
      this->active_navigation_info_ =
--- 5963,5968 ----
  void openvrml::browser::reset_default_navigation_info() OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_write_lock
!         lock(this->active_navigation_info_mutex_);
      assert(this->default_navigation_info_);
      this->active_navigation_info_ =
***************
*** 5879,5886 ****
      OPENVRML_THROW1(std::bad_alloc)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(std::find(this->viewpoint_list.begin(), this->viewpoint_list.end(),
!                      &viewpoint) == this->viewpoint_list.end());
!     this->viewpoint_list.push_back(&viewpoint);
  }
  
--- 5986,5993 ----
      OPENVRML_THROW1(std::bad_alloc)
  {
!     read_write_mutex::scoped_write_lock lock(this->viewpoint_list_mutex_);
!     assert(std::find(this->viewpoint_list_.begin(), this->viewpoint_list_.end(),
!                      &viewpoint) == this->viewpoint_list_.end());
!     this->viewpoint_list_.push_back(&viewpoint);
  }
  
***************
*** 5896,5907 ****
      OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(!this->viewpoint_list.empty());
      typedef std::list<viewpoint_node *> viewpoint_list_t;
!     const viewpoint_list_t::iterator end = this->viewpoint_list.end();
      const viewpoint_list_t::iterator pos =
!             std::find(this->viewpoint_list.begin(), end, &viewpoint);
      assert(pos != end);
!     this->viewpoint_list.erase(pos);
  }
  
--- 6003,6014 ----
      OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_write_lock lock(this->viewpoint_list_mutex_);
!     assert(!this->viewpoint_list_.empty());
      typedef std::list<viewpoint_node *> viewpoint_list_t;
!     const viewpoint_list_t::iterator end = this->viewpoint_list_.end();
      const viewpoint_list_t::iterator pos =
!             std::find(this->viewpoint_list_.begin(), end, &viewpoint);
      assert(pos != end);
!     this->viewpoint_list_.erase(pos);
  }
  
***************
*** 5911,5919 ****
   * @return the list of @c viewpoint_node%s for the world.
   */
! const std::list<openvrml::viewpoint_node *> &
  openvrml::browser::viewpoints() const OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     return this->viewpoint_list;
  }
  
--- 6018,6026 ----
   * @return the list of @c viewpoint_node%s for the world.
   */
! const std::list<openvrml::viewpoint_node *>
  openvrml::browser::viewpoints() const OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_read_lock lock(this->viewpoint_list_mutex_);
!     return this->viewpoint_list_;
  }
  
***************
*** 5929,5933 ****
      OPENVRML_THROW1(viewer_in_use)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      if (v && v->browser_) { throw viewer_in_use(); }
      if (this->viewer_) { this->viewer_->browser_ = 0; }
--- 6036,6040 ----
      OPENVRML_THROW1(viewer_in_use)
  {
!     read_write_mutex::scoped_write_lock lock(this->viewer_mutex_);
      if (v && v->browser_) { throw viewer_in_use(); }
      if (this->viewer_) { this->viewer_->browser_ = 0; }
***************
*** 5943,5947 ****
  openvrml::viewer * openvrml::browser::viewer() const OPENVRML_NOTHROW
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return this->viewer_;
  }
--- 6050,6054 ----
  openvrml::viewer * openvrml::browser::viewer() const OPENVRML_NOTHROW
  {
!     read_write_mutex::scoped_read_lock lock(this->viewer_mutex_);
      return this->viewer_;
  }
***************
*** 5978,5982 ****
  float openvrml::browser::current_speed()
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      navigation_info_node & nav_info = this->active_navigation_info();
      return nav_info.speed();
--- 6085,6090 ----
  float openvrml::browser::current_speed()
  {
!     read_write_mutex::scoped_read_lock
!         lock(this->active_navigation_info_mutex_);
      navigation_info_node & nav_info = this->active_navigation_info();
      return nav_info.speed();
***************
*** 5991,5995 ****
      OPENVRML_THROW1(std::bad_alloc)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      assert(this->scene_);
      return this->scene_->url(); // Throws std::bad_alloc.
--- 6099,6103 ----
      OPENVRML_THROW1(std::bad_alloc)
  {
!     read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
      assert(this->scene_);
      return this->scene_->url(); // Throws std::bad_alloc.
***************
*** 6008,6012 ****
  {
      {
!         boost::recursive_mutex::scoped_lock lock(this->mutex_);
  
          using std::for_each;
--- 6116,6122 ----
  {
      {
!         read_write_mutex::scoped_write_lock
!             scene_lock(this->scene_mutex_),
!             active_viewpoint_lock(this->active_viewpoint_mutex_);
  
          using std::for_each;
***************
*** 6029,6036 ****
          this->active_viewpoint_ =
              node_cast<viewpoint_node *>(this->default_viewpoint_.get());
!         assert(this->viewpoint_list.empty());
!         assert(this->scoped_lights.empty());
!         assert(this->scripts.empty());
!         assert(this->timers.empty());
  
          //
--- 6139,6146 ----
          this->active_viewpoint_ =
              node_cast<viewpoint_node *>(this->default_viewpoint_.get());
!         assert(this->viewpoint_list_.empty());
!         assert(this->scoped_lights_.empty());
!         assert(this->scripts_.empty());
!         assert(this->timers_.empty());
  
          //
***************
*** 6102,6106 ****
      const std::vector<boost::intrusive_ptr<node> > & nodes)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      const double now = browser::current_time();
      this->scene_->nodes(nodes);
--- 6212,6216 ----
      const std::vector<boost::intrusive_ptr<node> > & nodes)
  {
!     read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
      const double now = browser::current_time();
      this->scene_->nodes(nodes);
***************
*** 6130,6136 ****
  
              try {
!                 boost::recursive_mutex::scoped_lock lock(browser.mutex_);
!                 std::auto_ptr<resource_istream> in =
!                     browser.scene_->get_resource(this->url_);
                  if (!(*in)) { throw unreachable_url(); }
                  browser.set_world(*in);
--- 6240,6249 ----
  
              try {
!                 std::auto_ptr<resource_istream> in;
!                 {
!                     read_write_mutex::scoped_read_lock
!                         lock(browser.scene_mutex_);
!                     in = browser.scene_->get_resource(this->url_);
!                 }
                  if (!(*in)) { throw unreachable_url(); }
                  browser.set_world(*in);
***************
*** 6242,6245 ****
--- 6355,6359 ----
      std::vector<boost::intrusive_ptr<node> > nodes;
      try {
+         read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
          assert(this->scene_);
          std::map<string, string> meta;
***************
*** 6279,6282 ****
--- 6393,6397 ----
                      boost::thread_resource_error)
  {
+     read_write_mutex::scoped_read_lock lock(this->scene_mutex_);
      assert(this->scene_);
      this->scene_->create_vrml_from_url(url, node, event);
***************
*** 6324,6328 ****
  double openvrml::browser::frame_rate() const
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return this->frame_rate_;
  }
--- 6439,6443 ----
  double openvrml::browser::frame_rate() const
  {
!     read_write_mutex::scoped_read_lock lock(this->frame_rate_mutex_);
      return this->frame_rate_;
  }
***************
*** 6339,6343 ****
                                          const double (&point)[3])
  {
-     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      if (n) {
          if (pointing_device_sensor_node * pointing_device_sensor =
--- 6454,6457 ----
***************
*** 6371,6375 ****
      using std::for_each;
  
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
  
      if (current_time <= 0.0) { current_time = browser::current_time(); }
--- 6485,6491 ----
      using std::for_each;
  
!     read_write_mutex::scoped_read_lock
!         timers_lock(this->timers_mutex_),
!         scripts_lock(this->scripts_mutex_);
  
      if (current_time <= 0.0) { current_time = browser::current_time(); }
***************
*** 6380,6384 ****
      // Update each of the timers.
      //
!     for_each(this->timers.begin(), this->timers.end(),
               boost::bind2nd(boost::mem_fun(&time_dependent_node::update),
                              current_time));
--- 6496,6500 ----
      // Update each of the timers.
      //
!     for_each(this->timers_.begin(), this->timers_.end(),
               boost::bind2nd(boost::mem_fun(&time_dependent_node::update),
                              current_time));
***************
*** 6387,6391 ****
      // Update each of the scripts.
      //
!     for_each(this->scripts.begin(), this->scripts.end(),
               boost::bind2nd(boost::mem_fun(&script_node::update),
                              current_time));
--- 6503,6507 ----
      // Update each of the scripts.
      //
!     for_each(this->scripts_.begin(), this->scripts_.end(),
               boost::bind2nd(boost::mem_fun(&script_node::update),
                              current_time));
***************
*** 6411,6415 ****
  void openvrml::browser::render()
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      if (!this->viewer_) { return; }
  
--- 6527,6534 ----
  void openvrml::browser::render()
  {
!     read_write_mutex::scoped_read_lock
!         scene_lock(this->scene_mutex_),
!         active_viewpoint_lock_(this->active_viewpoint_mutex_);
! 
      if (!this->viewer_) { return; }
  
***************
*** 6469,6476 ****
  
      // Do the browser-level lights (Points and Spots)
!     std::for_each(this->scoped_lights.begin(), this->scoped_lights.end(),
!                   boost::bind2nd(
!                       boost::mem_fun(&scoped_light_node::render_scoped_light),
!                       *this->viewer_));
  
      //
--- 6588,6600 ----
  
      // Do the browser-level lights (Points and Spots)
!     {
!         using std::for_each;
!         read_write_mutex::scoped_read_lock
!             scoped_lights_lock(this->scoped_lights_mutex_);
!         for_each(this->scoped_lights_.begin(), this->scoped_lights_.end(),
!                  boost::bind2nd(
!                      boost::mem_fun(&scoped_light_node::render_scoped_light),
!                      *this->viewer_));
!     }
  
      //
***************
*** 6484,6487 ****
--- 6608,6613 ----
  
      // This is actually one frame late...
+     read_write_mutex::scoped_write_lock
+         frame_rate_lock(this->frame_rate_mutex_);
      this->frame_rate_ = this->viewer_->frame_rate();
  
***************
*** 6520,6524 ****
  void openvrml::browser::delta(const double d)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      if (d < this->delta_time) { this->delta_time = d; }
  }
--- 6646,6650 ----
  void openvrml::browser::delta(const double d)
  {
!     read_write_mutex::scoped_write_lock lock(this->delta_time_mutex_);
      if (d < this->delta_time) { this->delta_time = d; }
  }
***************
*** 6531,6535 ****
  double openvrml::browser::delta() const
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
      return this->delta_time;
  }
--- 6657,6661 ----
  double openvrml::browser::delta() const
  {
!     read_write_mutex::scoped_read_lock lock(this->delta_time_mutex_);
      return this->delta_time;
  }
***************
*** 6545,6552 ****
  openvrml::browser::add_scoped_light(scoped_light_node & light)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(std::find(this->scoped_lights.begin(), this->scoped_lights.end(),
!                      &light) == this->scoped_lights.end());
!     this->scoped_lights.push_back(&light);
  }
  
--- 6671,6678 ----
  openvrml::browser::add_scoped_light(scoped_light_node & light)
  {
!     read_write_mutex::scoped_write_lock lock(this->scoped_lights_mutex_);
!     assert(std::find(this->scoped_lights_.begin(), this->scoped_lights_.end(),
!                      &light) == this->scoped_lights_.end());
!     this->scoped_lights_.push_back(&light);
  }
  
***************
*** 6559,6573 ****
   */
  void
! openvrml::browser::
! remove_scoped_light(scoped_light_node & light)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(!this->scoped_lights.empty());
      const std::list<scoped_light_node *>::iterator end =
!         this->scoped_lights.end();
      const std::list<scoped_light_node *>::iterator pos =
!             std::find(this->scoped_lights.begin(), end, &light);
      assert(pos != end);
!     this->scoped_lights.erase(pos);
  }
  
--- 6685,6698 ----
   */
  void
! openvrml::browser::remove_scoped_light(scoped_light_node & light)
  {
!     read_write_mutex::scoped_write_lock lock(this->scoped_lights_mutex_);
!     assert(!this->scoped_lights_.empty());
      const std::list<scoped_light_node *>::iterator end =
!         this->scoped_lights_.end();
      const std::list<scoped_light_node *>::iterator pos =
!             std::find(this->scoped_lights_.begin(), end, &light);
      assert(pos != end);
!     this->scoped_lights_.erase(pos);
  }
  
***************
*** 6581,6588 ****
  void openvrml::browser::add_script(script_node & script)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(std::find(this->scripts.begin(), this->scripts.end(), &script)
!             == this->scripts.end());
!     this->scripts.push_back(&script);
  }
  
--- 6706,6713 ----
  void openvrml::browser::add_script(script_node & script)
  {
!     read_write_mutex::scoped_write_lock lock(this->scripts_mutex_);
!     assert(std::find(this->scripts_.begin(), this->scripts_.end(), &script)
!             == this->scripts_.end());
!     this->scripts_.push_back(&script);
  }
  
***************
*** 6596,6607 ****
  void openvrml::browser::remove_script(script_node & script)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(!this->scripts.empty());
      typedef std::list<script_node *> script_node_list_t;
!     const script_node_list_t::iterator end = this->scripts.end();
      const script_node_list_t::iterator pos =
!             std::find(this->scripts.begin(), end, &script);
      assert(pos != end);
!     this->scripts.erase(pos);
  }
  
--- 6721,6732 ----
  void openvrml::browser::remove_script(script_node & script)
  {
!     read_write_mutex::scoped_write_lock lock(this->scripts_mutex_);
!     assert(!this->scripts_.empty());
      typedef std::list<script_node *> script_node_list_t;
!     const script_node_list_t::iterator end = this->scripts_.end();
      const script_node_list_t::iterator pos =
!             std::find(this->scripts_.begin(), end, &script);
      assert(pos != end);
!     this->scripts_.erase(pos);
  }
  
***************
*** 6615,6622 ****
  void openvrml::browser::add_time_dependent(time_dependent_node & n)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(std::find(this->timers.begin(), this->timers.end(), &n)
!            == this->timers.end());
!     this->timers.push_back(&n);
  }
  
--- 6740,6747 ----
  void openvrml::browser::add_time_dependent(time_dependent_node & n)
  {
!     read_write_mutex::scoped_write_lock lock(this->timers_mutex_);
!     assert(std::find(this->timers_.begin(), this->timers_.end(), &n)
!            == this->timers_.end());
!     this->timers_.push_back(&n);
  }
  
***************
*** 6631,6641 ****
  openvrml::browser::remove_time_dependent(time_dependent_node & n)
  {
!     boost::recursive_mutex::scoped_lock lock(this->mutex_);
!     assert(!this->timers.empty());
!     const std::list<time_dependent_node *>::iterator end = this->timers.end();
      const std::list<time_dependent_node *>::iterator pos =
!             std::find(this->timers.begin(), end, &n);
      assert(pos != end);
!     this->timers.erase(pos);
  }
  
--- 6756,6766 ----
  openvrml::browser::remove_time_dependent(time_dependent_node & n)
  {
!     read_write_mutex::scoped_write_lock lock(this->timers_mutex_);
!     assert(!this->timers_.empty());
!     const std::list<time_dependent_node *>::iterator end = this->timers_.end();
      const std::list<time_dependent_node *>::iterator pos =
!             std::find(this->timers_.begin(), end, &n);
      assert(pos != end);
!     this->timers_.erase(pos);
  }
  

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** browser.h	18 May 2007 02:17:40 -0000	1.68
--- browser.h	21 May 2007 03:37:01 -0000	1.69
***************
*** 228,232 ****
          };
  
-         mutable boost::recursive_mutex mutex_;
          const boost::scoped_ptr<null_node_metatype> null_node_metatype_;
          const boost::scoped_ptr<null_node_type> null_node_type_;
--- 228,231 ----
***************
*** 235,247 ****
          node_metatype_map node_metatype_map_;
          script_node_metatype script_node_metatype_;
          boost::scoped_ptr<scene> scene_;
          const boost::intrusive_ptr<node> default_viewpoint_;
          viewpoint_node * active_viewpoint_;
          const boost::intrusive_ptr<node> default_navigation_info_;
          navigation_info_node * active_navigation_info_;
!         std::list<viewpoint_node *> viewpoint_list;
!         std::list<scoped_light_node *> scoped_lights;
!         std::list<script_node *> scripts;
!         std::list<time_dependent_node *> timers;
  
          read_write_mutex listeners_mutex_;
--- 234,263 ----
          node_metatype_map node_metatype_map_;
          script_node_metatype script_node_metatype_;
+         resource_fetcher & fetcher_;
+ 
+         mutable read_write_mutex scene_mutex_;
          boost::scoped_ptr<scene> scene_;
+ 
          const boost::intrusive_ptr<node> default_viewpoint_;
+ 
+         mutable read_write_mutex active_viewpoint_mutex_;
          viewpoint_node * active_viewpoint_;
+ 
          const boost::intrusive_ptr<node> default_navigation_info_;
+ 
+         mutable read_write_mutex active_navigation_info_mutex_;
          navigation_info_node * active_navigation_info_;
! 
!         mutable read_write_mutex viewpoint_list_mutex_;
!         std::list<viewpoint_node *> viewpoint_list_;
! 
!         read_write_mutex scoped_lights_mutex_;
!         std::list<scoped_light_node *> scoped_lights_;
! 
!         read_write_mutex scripts_mutex_;
!         std::list<script_node *> scripts_;
! 
!         read_write_mutex timers_mutex_;
!         std::list<time_dependent_node *> timers_;
  
          read_write_mutex listeners_mutex_;
***************
*** 249,253 ****
--- 265,273 ----
  
          bool new_view;
+ 
+         mutable read_write_mutex delta_time_mutex_;
          double delta_time;
+ 
+         mutable read_write_mutex viewer_mutex_;
          openvrml::viewer * viewer_;
  
***************
*** 255,259 ****
          mutable read_write_mutex modified_mutex_;
  
!         resource_fetcher & fetcher_;
  
          mutable boost::mutex out_mutex_;
--- 275,280 ----
          mutable read_write_mutex modified_mutex_;
  
!         mutable read_write_mutex frame_rate_mutex_;
!         double frame_rate_;
  
          mutable boost::mutex out_mutex_;
***************
*** 263,269 ****
          std::ostream * const err_;
  
-     protected:
-         double frame_rate_;
- 
      public:
          static double current_time() OPENVRML_NOTHROW;
--- 284,287 ----
***************
*** 298,303 ****
              OPENVRML_THROW1(std::bad_alloc);
          void remove_viewpoint(viewpoint_node & viewpoint) OPENVRML_NOTHROW;
!         const std::list<viewpoint_node *> & viewpoints() const
!             OPENVRML_NOTHROW;
          void viewer(openvrml::viewer * v) OPENVRML_THROW1(viewer_in_use);
          openvrml::viewer * viewer() const OPENVRML_NOTHROW;
--- 316,320 ----
              OPENVRML_THROW1(std::bad_alloc);
          void remove_viewpoint(viewpoint_node & viewpoint) OPENVRML_NOTHROW;
!         const std::list<viewpoint_node *> viewpoints() const OPENVRML_NOTHROW;
          void viewer(openvrml::viewer * v) OPENVRML_THROW1(viewer_in_use);
          openvrml::viewer * viewer() const OPENVRML_NOTHROW;

[openvrml-commit] openvrml ChangeLog,1.1505,1.1506

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

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

Modified Files:
	ChangeLog 
Log Message:
Replaced the browser-wide recursive mutex with several read-write mutexes.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1505
retrieving revision 1.1506
diff -C2 -d -r1.1505 -r1.1506
*** ChangeLog	18 May 2007 06:49:06 -0000	1.1505
--- ChangeLog	21 May 2007 03:37:00 -0000	1.1506
***************
*** 1,2 ****
--- 1,88 ----
+ 2007-05-20 Braden McDaniel  <br...@en...>
+ 
+ 	Replaced the browser-wide recursive mutex with several read-write
+ 	mutexes.
+ 
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::browser::browser(resource_fetcher &, std::ostream &,
+ 	std::ostream &)): Changed positions of fetcher_ and frame_rate_ in
+ 	the member initializer list to match the declaration order.
+ 	(openvrml::browser::~browser()): Lock the scene_mutex_ for
+ 	reading.
+ 	(openvrml::browser::root_scene() const): Lock the scene_mutex_ for
+ 	reading.
+ 	(openvrml::browser::find_node(const node &) const): Lock the
+ 	scene_mutex_ for reading.
+ 	(openvrml::browser::active_viewpoint() const): Lock the
+ 	active_viewpoint_mutex_ for reading.
+ 	(openvrml::browser::active_viewpoint(viewpoint_node &)): Lock the
+ 	active_viewpoint_mutex_ for writing.
+ 	(openvrml::browser::reset_default_viewpoint()): Lock the
+ 	active_viewpoint_mutex_ for writing.
+ 	(openvrml::browser::active_navigation_info() const): Lock the
+ 	active_navigation_info_mutex_ for reading.
+ 	(openvrml::browser::active_navigation_info(navigation_info_node&)):
+ 	Lock the active_navigation_info_mutex_ for writing.
+ 	(openvrml::browser::reset_default_navigation_info()): Lock the
+ 	active_navigation_info_mutex_ for writing.
+ 	(openvrml::browser::add_viewpoint(viewpoint_node &)): Lock the
+ 	viewpoint_list_mutex_ for writing.
+ 	(openvrml::browser::remove_viewpoint(viewpoint_node &)): Lock the
+ 	viewpoint_list_mutex_ for writing.
+ 	(openvrml::browser::viewer(openvrml::viewer *)): Lock the
+ 	viewer_mutex_ for writing.
+ 	(openvrml::browser::viewer()): Lock the viewer_mutex_ for reading.
+ 	(openvrml::browser::current_speed()): Lock the
+ 	active_navigation_info_mutex_ for reading.
+ 	(openvrml::browser::world_url() const): Lock the scene_mutex_ for
+ 	reading.
+ 	(openvrml::browser::set_world(resource_istream &)): Lock the
+ 	scene_mutex_ and the active_viewpoint_mutex_ for writing.
+ 	(openvrml::browser::replace_world(const
+ 	std::vector<boost::intrusive_ptr<node> > &)): Lock the
+ 	scene_mutex_ for reading.
+ 	(openvrml::browser::root_scene_loader::operator()() const): Lock
+ 	the browser::scene_mutex_ for reading while getting the
+ 	resource_istream.
+ 	(openvrml::browser::create_vrml_from_stream(std::istream &, const
+ 	std::string &)): Lock the scene_mutex_ for reading.
+ 	(openvrml::browser::create_vrml_from_url(const
+ 	std::vector<std::string> &, const boost::intrusive_ptr<node> &,
+ 	const std::string &)): Lock the scene_mutex_ for reading.
+ 	(openvrml::browser::frame_rate() const): Lock the
+ 	frame_rate_mutex_ for reading.
+ 	(openvrml::browser::sensitive_event(node *, double, bool, bool,
+ 	const double (&)[3])): Don't need to lock the browser here.
+ 	(openvrml::browser::update(double)): Lock the timers_mutex_ and
+ 	the scripts_mutex_ for reading.
+ 	(openvrml::browser::render()): Lock the scene_mutex_ and the
+ 	active_viewpoint_mutex_ for reading.  Lock the
+ 	scoped_lights_mutex_ for reading while iterating over the
+ 	scoped_lights_ list.  Lock the frame_rate_mutex_ for writing.
+ 	(openvrml::browser::delta(double)): Lock the delta_time_mutex_ for
+ 	writing.
+ 	(openvrml::browser::delta() const): Lock the delta_time_mutex_ for
+ 	reading.
+ 	(openvrml::browser::add_scoped_light(scoped_light_node &)): Lock
+ 	the scoped_lights_mutex_ for writing.
+ 	(openvrml::browser::remove_scoped_light(scoped_light_node &)):
+ 	Lock the scoped_lights_mutex_ for writing.
+ 	(openvrml::browser::add_script(script_node &)): Lock the
+ 	scripts_mutex_ for writing.
+ 	(openvrml::browser::remove_script(script_node &)): Lock the
+ 	scripts_mutex_ for writing.
+ 	(openvrml::browser::add_time_dependent(time_dependent_node &)):
+ 	Lock the timers_mutex_ for writing.
+ 	(openvrml::browser::remove_time_dependent(time_dependent_node &)):
+ 	Lock the timers_mutex_ for writing.
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::browser): Removed mutex_; added scene_mutex_,
+ 	active_viewpoint_mutex_, active_navigation_info_mutex_,
+ 	viewpoint_list_mutex_, scoped_lights_mutex_, scripts_mutex_,
+ 	timers_mutex_, delta_time_mutex_, viewer_mutex_, and
+ 	frame_rate_mutex_.  Made frame_rate_ private rather than
+ 	protected.  Changed viewpoints accessor to return a copy of the
+ 	list (rather than a const reference).
+ 
  2007-05-18 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml ChangeLog,1.1504,1.1505

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

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

Modified Files:
	ChangeLog 
Log Message:
Apply OPENVRML_API to read_write_mutex.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1504
retrieving revision 1.1505
diff -C2 -d -r1.1504 -r1.1505
*** ChangeLog	18 May 2007 02:17:39 -0000	1.1504
--- ChangeLog	18 May 2007 06:49:06 -0000	1.1505
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-05-18 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/read_write_mutex.h
+ 	(openvrml::read_write_mutex): Apply OPENVRML_API to
+ 	read_write_mutex.
+ 
  2007-05-17 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml read_write_mutex.h, 1.1, 1.2

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

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

Modified Files:
	read_write_mutex.h 
Log Message:
Apply OPENVRML_API to read_write_mutex.

Index: read_write_mutex.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/read_write_mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** read_write_mutex.h	15 May 2007 04:06:11 -0000	1.1
--- read_write_mutex.h	18 May 2007 06:49:08 -0000	1.2
***************
*** 29,33 ****
  namespace openvrml {
  
!     class read_write_mutex : boost::noncopyable {
          boost::mutex mutex_;
          boost::condition read_, write_;
--- 29,33 ----
  namespace openvrml {
  
!     class OPENVRML_API read_write_mutex : boost::noncopyable {
          boost::mutex mutex_;
          boost::condition read_, write_;

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.h, 1.67, 1.68

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

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

Modified Files:
	browser.h 
Log Message:
Changed null_node_metatype_ and null_node_type_ from auto_ptrs to scoped_ptrs.

Index: browser.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** browser.h	15 May 2007 04:06:11 -0000	1.67
--- browser.h	18 May 2007 02:17:40 -0000	1.68
***************
*** 229,234 ****
  
          mutable boost::recursive_mutex mutex_;
!         std::auto_ptr<null_node_metatype> null_node_metatype_;
!         std::auto_ptr<null_node_type> null_node_type_;
          boost::scoped_ptr<boost::thread> load_root_scene_thread_;
          boost::thread_group load_proto_thread_group_;
--- 229,234 ----
  
          mutable boost::recursive_mutex mutex_;
!         const boost::scoped_ptr<null_node_metatype> null_node_metatype_;
!         const boost::scoped_ptr<null_node_type> null_node_type_;
          boost::scoped_ptr<boost::thread> load_root_scene_thread_;
          boost::thread_group load_proto_thread_group_;

[openvrml-commit] openvrml ChangeLog,1.1503,1.1504

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

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

Modified Files:
	ChangeLog 
Log Message:
Changed null_node_metatype_ and null_node_type_ from auto_ptrs to scoped_ptrs.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1503
retrieving revision 1.1504
diff -C2 -d -r1.1503 -r1.1504
*** ChangeLog	17 May 2007 06:05:32 -0000	1.1503
--- ChangeLog	18 May 2007 02:17:39 -0000	1.1504
***************
*** 1,4 ****
--- 1,10 ----
  2007-05-17 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/browser.h
+ 	(openvrml::browser): Changed null_node_metatype_ and
+ 	null_node_type_ from auto_ptrs to scoped_ptrs.
+ 
+ 2007-05-17 Braden McDaniel  <br...@en...>
+ 
  	* doc/doxygen-header: Style sheet fixes.
  

[openvrml-commit] openvrml ChangeLog,1.1310.2.171,1.1310.2.172

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Visual C++ 8.0 project file updates.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.171
retrieving revision 1.1310.2.172
diff -C2 -d -r1.1310.2.171 -r1.1310.2.172
*** ChangeLog	17 May 2007 06:05:11 -0000	1.1310.2.171
--- ChangeLog	17 May 2007 07:17:44 -0000	1.1310.2.172
***************
*** 1,17361 ****
! 2007-05-17 Braden McDaniel  <br...@en...>
! 
! 	* doc/doxygen-header: Style sheet fixes.
! 
! 2007-05-11 Braden McDaniel  <br...@en...>
! 
! 	Protect the plugin_streambuf_map with a mutex.
! 
! 	* src/openvrml-xembed/main.cpp
! 	(openvrml_xembed::command_istream_reader::operator()() const):
[...34710 lines suppressed...]
! 	Removed win32Lookat.  This, too, belongs in its own package. But
! 	I'll leave the specifics of that package to the Win32 developers.
! 
! 	Removed the javascript subtree and added a newer version of libjs
! 	to src/vrml97/libjs, and incorporated it into the automake build.
! 
! 	Nuked the OLD directory.  These build scripts certainly would need
! 	a good deal of reworking after the reorg I've done, and hopefully
! 	the use of automake means they are nolonger necessary.  If anyone
! 	needs they can be found in an older tarball.
! 
! 1999-10-17  Braden N. McDaniel  <br...@en...>
! 
! 	OpenGL renderer displaced from libvrml97core and placed in
! 	libvrml97gl.
! 
! 	Helper functions from MathHelper.cpp in libvrml97core placed in an
! 	unnamed namespace in ViewerOpenGL.cpp.
! 
! 	OpenGLEvent.c renamed to OpenGLEvent.cpp.

[openvrml-commit] openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer sdl-viewer.vcproj, 1.4.2.2, 1.4.2.3

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

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23887/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	sdl-viewer.vcproj 
Log Message:
Visual C++ 8.0 project file updates.

Index: sdl-viewer.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** sdl-viewer.vcproj	26 Sep 2006 15:42:35 -0000	1.4.2.2
--- sdl-viewer.vcproj	17 May 2007 07:17:46 -0000	1.4.2.3
***************
*** 69,72 ****
--- 69,73 ----
  				OutputFile="$(SolutionDir)..\bin\sdl-viewerd.exe"
  				LinkIncremental="2"
+ 				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="true"
  				ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb"

[openvrml-commit] openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml openvrml.vcproj, 1.4.2.8, 1.4.2.9

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

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23887/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.vcproj 
Log Message:
Visual C++ 8.0 project file updates.

Index: openvrml.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -d -r1.4.2.8 -r1.4.2.9
*** openvrml.vcproj	30 Apr 2007 07:37:08 -0000	1.4.2.8
--- openvrml.vcproj	17 May 2007 07:17:46 -0000	1.4.2.9
***************
*** 68,72 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="freetype221MT_D.lib"
  				OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll"
  				GenerateDebugInformation="true"
--- 68,72 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib freetype234MT_D.lib"
  				OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll"
  				GenerateDebugInformation="true"
***************
*** 153,157 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="freetype221MT.lib"
  				OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll"
  				LinkTimeCodeGeneration="1"
--- 153,157 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="gdi32.lib advapi32.lib shell32.lib freetype234MT.lib"
  				OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll"
  				LinkTimeCodeGeneration="1"