From 42fb3c59875ed99eefc6e59f974f711d1ca6e48c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 18 Nov 2002 16:14:00 +0000
Subject: [PATCH] Added setDrawable(uint,Drawable*) method.

---
 include/osg/Geode | 44 +++++++++++++++++++++++++++++---------------
 src/osg/Geode.cpp | 18 +++++++++++++++---
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/include/osg/Geode b/include/osg/Geode
index f89490554..83af40f13 100644
--- a/include/osg/Geode
+++ b/include/osg/Geode
@@ -34,15 +34,18 @@ class SG_EXPORT Geode : public Node
         virtual bool addDrawable( Drawable *drawable );
 
         /** Remove Drawable from Geode.
-         *  If gset is contained in Geode then remove it from the geoset
-         *  list and decrement its reference count, and dirty the 
-         *  bounding sphere to force it to recompute on next getBound() and
-         *  return true for success.  If gset is not found then return false
-         *  and do not change the reference count of gset.
-         */
+          * Equivalent to setDrawabke(findDrawableNum(orignChild),node), 
+          * see docs for setNode for futher details on implementation.*/
+
         virtual bool removeDrawable( Drawable *drawable );
 
         /** Replace specified Drawable with another Drawable.
+          * Equivalent to setDrawable(findDrawableNum(orignChild),node), 
+          * see docs for setDrawable for futher details on implementation.*/
+        virtual bool replaceDrawable( Drawable *origDraw, Drawable *newDraw );
+
+        /** set drawable at position i.
+         * return true if set correctly, false on failure (if node==NULL || i is out of range).
          *  Decrement the reference count origGSet and increments the
          *  reference count of newGset, and dirty the bounding sphere
          *  to force it to recompute on next getBound() and returns true.
@@ -50,19 +53,18 @@ class SG_EXPORT Geode : public Node
          *  add newGset.  If newGset is NULL then return false and do
          *  not remove origGset.
          */
-        virtual bool replaceDrawable( Drawable *origDraw, Drawable *newDraw );
+        virtual bool setDrawable( unsigned int i, Drawable* drawable );
 
-
-        /** return the number of geoset's.*/
+        /** return the number of drawable's.*/
         inline unsigned int getNumDrawables() const { return _drawables.size(); }
 
-        /** return geoset at position i.*/
+        /** return drawable at position i.*/
         inline Drawable* getDrawable( unsigned int i ) { return _drawables[i].get(); }
 
-        /** return geoset at position i.*/
+        /** return drawable at position i.*/
         inline const Drawable* getDrawable( unsigned int i ) const { return _drawables[i].get(); }
 
-        /** return true if geoset is contained within Geode.*/
+        /** return true if drawable is contained within Geode.*/
         inline bool containsDrawable(const Drawable* gset) const
         {
             
@@ -76,7 +78,7 @@ class SG_EXPORT Geode : public Node
         }
 
         /** return the iterator position for specified Drawable.
-         *  return _geoset.end() if gset not is contained in Geode.
+         *  return _drawables.end() if gset not is contained in Geode.
          */
         inline DrawableList::iterator findDrawable(const Drawable* gset)
         {
@@ -91,7 +93,7 @@ class SG_EXPORT Geode : public Node
         }
 
         /** return the const_iterator position for specified Drawable.
-         *  return _geoset.end() if gset not is contained in Geode.
+         *  return _drawables.end() if gset not is contained in Geode.
          */
         inline DrawableList::const_iterator findDrawable(const Drawable* gset) const
         {
@@ -105,7 +107,19 @@ class SG_EXPORT Geode : public Node
             return _drawables.end();
         }
 
-        /** compile OpenGL Display List for each geoset.*/
+        /** Find the index number of drawable, return a value between
+          * 0 and _drawables.size()-1 if found, if not found then
+          * return _drawables.size().*/
+        inline unsigned int findDrawableNum( const Drawable* node ) const
+        {
+            for (unsigned int drawableNum=0;drawableNum<_drawables.size();++drawableNum)
+            {
+                if (_drawables[drawableNum]==node) return drawableNum;
+            }
+            return _drawables.size(); // node not found.
+        }
+
+        /** compile OpenGL Display List for each drawable.*/
         void compileDrawables(State& state);
         
     protected:
diff --git a/src/osg/Geode.cpp b/src/osg/Geode.cpp
index cf2eb3ec6..9e39957e4 100644
--- a/src/osg/Geode.cpp
+++ b/src/osg/Geode.cpp
@@ -84,9 +84,21 @@ bool Geode::replaceDrawable( Drawable *origDrawable, Drawable *newDrawable )
 {
     if (newDrawable==NULL || origDrawable==newDrawable) return false;
 
-    DrawableList::iterator itr = findDrawable(origDrawable);
-    if (itr!=_drawables.end())
+    unsigned int pos = findDrawableNum(origDrawable);
+    if (pos<_drawables.size())
     {
+        return setDrawable(pos,newDrawable);
+    }
+    return false;
+}
+
+bool Geode::setDrawable( unsigned  int i, Drawable* newDrawable )
+{
+    if (i<_drawables.size() && newDrawable)
+    {
+    
+        Drawable* origDrawable = _drawables[i].get();
+
         int delta = 0;
         if (origDrawable->getAppCallback()) --delta;
         if (newDrawable->getAppCallback()) ++delta;
@@ -100,7 +112,7 @@ bool Geode::replaceDrawable( Drawable *origDrawable, Drawable *newDrawable )
         
         // note ref_ptr<> automatically handles decrementing origGset's reference count,
         // and inccrementing newGset's reference count.
-        *itr = newDrawable;
+        _drawables[i] = newDrawable;
 
         // register as parent of child.
         newDrawable->addParent(this);