From: Braden M. <br...@us...> - 2006-11-22 00:05:20
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3665 Modified Files: ChangeLog Log Message: Factored creation of openvrml::resource_istreams to a dedicated abstract factory, openvrml::resource_fetcher. This allows the code associated with resource fetching to live at least as long as the browser instance, which it needs to do if there are any outstanding fetches happening when the browser instance is destroyed. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1379 retrieving revision 1.1380 diff -C2 -d -r1.1379 -r1.1380 *** ChangeLog 20 Nov 2006 03:20:28 -0000 1.1379 --- ChangeLog 22 Nov 2006 00:05:17 -0000 1.1380 *************** *** 1,2 **** --- 1,58 ---- + 2006-11-21 Braden McDaniel <br...@en...> + + Factored creation of openvrml::resource_istreams to a dedicated + abstract factory, openvrml::resource_fetcher. This allows the + code associated with resource fetching to live at least as long as + the browser instance, which it needs to do if there are any + outstanding fetches happening when the browser instance is + destroyed. + + * doc/index.doc: Updates to reflect addition of + openvrml::resource_fetcher. + * examples/sdl_viewer.cpp: Inherit openvrml::resource_fetcher to + implement do_get_resource instead of openvrml::browser. + * src/libopenvrml/openvrml/browser.cpp + (openvrml::resource_fetcher::~resource_fetcher()): Destructor. + (openvrml::resource_fetcher::get_resource(const std::string &)): + Delegate to do_get_resource. + (openvrml::browser::browser(resource_fetcher &, std::ostream &, + std::ostream &)): Initialize openvrml::browser::fetcher_. + (openvrml::browser::get_resource(const std::string &)): Removed + function. + (openvrml::scene::get_resource(const std::vector<std::string> &) + const): Delegate instead to browser::fetcher_. + * src/libopenvrml/openvrml/browser.h + (openvrml::resource_fetcher): Added class. + (openvrml::browser): Granted friendship to openvrml::scene so that + it can access browser::fetcher_; added browser::fetcher_ member; + changed constructor to take an openvrml::resource_fetcher + reference; removed browser::get_resource and + browser::do_get_resource members. + * src/openvrml-gtkplug/gtkvrmlbrowser.cpp + (browser): Removed class. + (resource_fetcher): Added class. + (GtkGLViewer): Added concrete resource_fetcher member; changed + browser_ member to be an openvrml::browser. + (GtkGLViewer::GtkGLViewer(GIOChannel &, GtkVrmlBrowser &)): + Initialize fetcher_ with the GIOChannel; initialize browser_ with + fetcher_. + * tests/Makefile.am + (noinst_HEADERS): Changed test_browser.h to + test_resource_fetcher.h. + (libtest_openvrml_la_SOURCES): Changed test_browser.cpp to + test_resource_fetcher.cpp. + * tests/browser.cpp: Use test_resource_fetcher instead of + test_browser. + * tests/parse_anchor.cpp: Use test_resource_fetcher instead of + test_browser. + * tests/parse_vrml97.cpp: Use test_resource_fetcher instead of + test_browser. + * tests/parse_x3dvrml.cpp: Use test_resource_fetcher instead of + test_browser. + * tests/test_browser.cpp: Removed file. + * tests/test_browser.h: Removed file. + * tests/test_resource_fetcher.cpp: Added file. + * tests/test_resource_fetcher.h: Added file. + 2006-11-19 Braden McDaniel <br...@en...> |