SF.net SVN: openvrml:[3901] trunk

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

Revision: 3901
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3901&view=rev
Author:   braden
Date:     2009-05-03 14:49:50 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Improved lod_node::do_modified only to check the currently applicable child node(s).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/lod.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-01 05:45:39 UTC (rev 3900)
+++ trunk/ChangeLog	2009-05-03 14:49:50 UTC (rev 3901)
@@ -1,3 +1,14 @@
+2009-05-03 Braden McDaniel  <br...@en...>
+
+	Improved lod_node::do_modified only to check the currently
+	applicable child node(s).
+
+	* src/node/vrml97/lod.cpp
+	(lod_node::do_modified() const): Just check current_children_.
+	(lod_node::do_render_child(openvrml::viewer &,
+	openvrml::rendering_context)): Update current_children_ with the
+	currently appropriate "level".
+
 2009-05-01 Braden McDaniel  <br...@en...>
 
 	* src/node/vrml97/background.cpp

Modified: trunk/src/node/vrml97/lod.cpp
===================================================================
--- trunk/src/node/vrml97/lod.cpp	2009-05-01 05:45:39 UTC (rev 3900)
+++ trunk/src/node/vrml97/lod.cpp	2009-05-03 14:49:50 UTC (rev 3901)
@@ -120,11 +120,8 @@
     bool lod_node::do_modified() const
         OPENVRML_THROW1(boost::thread_resource_error)
     {
-        // This should really check which range is being rendered...
-        for (size_t i = 0; i < this->children_.value().size(); ++i) {
-            if (this->children_.value()[i]->modified()) { return true; }
-        }
-        return false;
+        return !this->current_children_.value().empty()
+            && this->current_children_.value()[0]->modified();
     }
 
     /**
@@ -132,53 +129,51 @@
      *
      * Render one of the children.
      *
-     * @param viewer    a Viewer.
+     * @param viewer    a @c viewer.
      * @param context   a rendering context.
      */
-    void
-    lod_node::
-    do_render_child(openvrml::viewer & viewer,
-                    const openvrml::rendering_context context)
+    void lod_node::do_render_child(openvrml::viewer & viewer,
+                                   const openvrml::rendering_context context)
     {
-        this->node::modified(false);
-        if (this->children_.mfnode::value().empty()) { return; }
+        using openvrml::mat4f;
+        using openvrml::vec3f;
+        using openvrml::make_vec3f;
+        using openvrml::node;
+        using boost::intrusive_ptr;
+        using std::vector;
 
-        float x, y, z;
+        if (this->children_.value().empty()) { return; }
 
-        openvrml::mat4f MV = context.matrix();
-        MV = MV.inverse();
-        x = MV[3][0]; y = MV[3][1]; z = MV[3][2];
-        float dx = x - this->center_.value().x();
-        float dy = y - this->center_.value().y();
-        float dz = z - this->center_.value().z();
-        float d2 = dx * dx + dy * dy + dz * dz;
+        const mat4f modelview = context.matrix().inverse();
+        vec3f v = make_vec3f(modelview[3][0], modelview[3][1], modelview[3][2]);
+        v -= this->center_.value();
+        const float d2 = v.dot(v);
 
         size_t i;
-        for (i = 0; i < this->range_.value().size(); ++i) {
-            if (d2 < this->range_.value()[i] * this->range_.value()[i]) {
-                break;
+        if (this->range_.value().empty()) {
+            i = this->children_.value().size() - 1;
+        } else {
+            for (i = 0; i < this->range_.value().size(); ++i) {
+                if (d2 < this->range_.value()[i] * this->range_.value()[i]) {
+                    break;
+                }
             }
         }
 
-        // Should choose an "optimal" level...
-        if (this->range_.value().empty()) {
-            i = this->children_.mfnode::value().size() - 1;
-        }
-
         // Not enough levels...
-        if (i >= this->children_.mfnode::value().size()) {
-            i = this->children_.mfnode::value().size() - 1;
+        if (i >= this->children_.value().size()) {
+            i = this->children_.value().size() - 1;
         }
 
+        vector<intrusive_ptr<node> > current_child(1);
+        current_child[0] = this->children_.value()[i];
+        this->current_children_.value(current_child);
+
         child_node * const child =
-            openvrml::node_cast<child_node *>(
-                this->children_.mfnode::value()[i].get());
+            openvrml::node_cast<child_node *>(current_child[0].get());
         if (child) { child->render_child(viewer, context); }
 
-        // Don't re-render on their accounts
-        for (i = 0; i < this->children_.mfnode::value().size(); ++i) {
-            this->children_.mfnode::value()[i]->modified(false);
-        }
+        current_child[0]->modified(false);
     }
 
     /**


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