Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29801
Modified Files:
ChangeLog
Log Message:
Ensure that scene pointers for the active viewpoint_node and the active navigation_info_node point to scenes that are either the browser's root_scene or one of its descendants.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -C2 -d -r1.1514 -r1.1515
*** ChangeLog 1 Jun 2007 05:34:01 -0000 1.1514
--- ChangeLog 1 Jun 2007 06:08:44 -0000 1.1515
***************
*** 1,6 ****
--- 1,23 ----
2007-06-01 Braden McDaniel <br...@en...>
+ Ensure that scene pointers for the active viewpoint_node and the
+ active navigation_info_node point to scenes that are either the
+ browser's root_scene or one of its descendants.
+
+ * src/libopenvrml/openvrml/browser.cpp
+ (openvrml::browser::active_viewpoint(viewpoint_node &)): Validate
+ that the argument viewpoint_node's scene is (a descendant of) the
+ browser's root_scene.
+ (openvrml::browser::active_navigation_info(navigation_info_node&)):
+ Validate that the argument navigation_info_node's scene is (a
+ descendant of) the browser's root_scene.
+
+ 2007-06-01 Braden McDaniel <br...@en...>
+
Removed node-wide recursive mutex.
+ * src/libopenvrml/openvrml/browser.cpp
+ (openvrml::externproto_node::set_proto_node(proto_node_type &)):
+ Removed lock.
* src/libopenvrml/openvrml/node.cpp
(openvrml::node::scene() const): Moved definition from node.h;
***************
*** 106,110 ****
(insertShellConvex(ShellData *)): Ensure indices are valid before
using them.
! (openvrml::gl::viewer::insert_shell(unsigned int, const
std::vector<vec3f> &, const std::vector<int32> &, const
std::vector<color> &, const std::vector<int32> &, const
--- 123,127 ----
(insertShellConvex(ShellData *)): Ensure indices are valid before
using them.
! (openvrml::gl::viewer::do_insert_shell(unsigned int, const
std::vector<vec3f> &, const std::vector<int32> &, const
std::vector<color> &, const std::vector<int32> &, const
|
