|
From: <br...@us...> - 2009-04-06 07:05:20
|
Revision: 3885
http://openvrml.svn.sourceforge.net/openvrml/?rev=3885&view=rev
Author: braden
Date: 2009-04-06 07:05:11 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Removed cruft.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/node/vrml97/background.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-05 05:32:54 UTC (rev 3884)
+++ trunk/ChangeLog 2009-04-06 07:05:11 UTC (rev 3885)
@@ -1,5 +1,12 @@
2009-04-05 Braden McDaniel <br...@en...>
+ * src/node/vrml97/background.cpp
+ (update_texture(openvrml_node_vrml97::background_node &,
+ openvrml::read_write_mutex &, const openvrml::mfstring &,
+ openvrml::image &)): Removed (cruft).
+
+2009-04-05 Braden McDaniel <br...@en...>
+
Clean up allocated GL resources on window resize so that the
viewer can be reinitialized. Some platforms and bindings (notably
SDL on Windows) destroy the GL context on resize.
Modified: trunk/src/node/vrml97/background.cpp
===================================================================
--- trunk/src/node/vrml97/background.cpp 2009-04-05 05:32:54 UTC (rev 3884)
+++ trunk/src/node/vrml97/background.cpp 2009-04-06 07:05:11 UTC (rev 3885)
@@ -793,37 +793,6 @@
namespace {
- OPENVRML_LOCAL void
- update_texture(openvrml_node_vrml97::background_node & node,
- openvrml::read_write_mutex & img_mutex,
- const openvrml::mfstring & url,
- openvrml::image & img)
- OPENVRML_THROW1(std::bad_alloc)
- {
- try {
- using openvrml::image;
- using openvrml_node_vrml97::image_stream_listener;
-
- if (url.value().empty()) {
- img = image();
- } else {
- using std::auto_ptr;
-
- auto_ptr<openvrml::resource_istream> in(
- node.scene()->get_resource(url.value()));
- auto_ptr<openvrml::stream_listener> listener(
- new image_stream_listener(in->url(),
- img,
- node,
- img_mutex));
- node.scene()->read_stream(in, listener);
- }
- } catch (const openvrml::no_alternative_url &) {}
- }
-}
-
-namespace {
-
const boost::shared_ptr<openvrml::scope> null_scope_ptr;
null_texture_node::null_texture_node(const openvrml::null_node_type & type)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|