SF.net SVN: openvrml:[3902] trunk

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

Revision: 3902
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3902&view=rev
Author:   braden
Date:     2009-05-04 04:08:11 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Initialize the viewer in openvrml::gl::viewer::checkSensitive.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-03 14:49:50 UTC (rev 3901)
+++ trunk/ChangeLog	2009-05-04 04:08:11 UTC (rev 3902)
@@ -1,3 +1,15 @@
+2009-05-04 Braden McDaniel  <br...@en...>
+
+	Initialize the viewer in openvrml::gl::viewer::checkSensitive.
+
+	* src/libopenvrml-gl/openvrml/gl/viewer.cpp
+	(openvrml::gl::viewer::initialize()): Return if the viewer has
+	already been initialized.
+	(openvrml::gl::viewer::redraw()): Moved "already-initialized"
+	check to the initialize function.
+	(openvrml::gl::viewer::checkSensitive(int, int, event_type)): Call
+	viewer::initialize.
+
 2009-05-03 Braden McDaniel  <br...@en...>
 
 	Improved lod_node::do_modified only to check the currently

Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2009-05-03 14:49:50 UTC (rev 3901)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp	2009-05-04 04:08:11 UTC (rev 3902)
@@ -944,6 +944,8 @@
  */
 void openvrml::gl::viewer::initialize()
 {
+    if (this->gl_initialized) { return; }
+
     assert(!this->tesselator);
     this->tesselator = gluNewTess();
 
@@ -3978,7 +3980,7 @@
 {
     assert(this->browser());
 
-    if (!this->gl_initialized) { initialize(); }
+    this->initialize();
 
     double start = browser::current_time();
 
@@ -4433,6 +4435,8 @@
 {
     assert(this->browser());
 
+    this->initialize();
+
     double timeNow = browser::current_time();
     GLint viewport[4];
     glGetIntegerv(GL_VIEWPORT, viewport);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.