From 880682f138f615bed4c5409d0ab28d5cdabc000d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 11 Dec 2007 11:55:15 +0000
Subject: [PATCH] From Mathias Froelich, "I have cleaned up the state set
 handling of the osg::ClipNode. Previously the complete StateSet was cleared,
 even the non clipping releted state attributes and modes in this stateset on
 a call to setLocalSetateSetModes. With this change only those
 modes/attributes are changed that need to be changed. That is, if a clip
 plane is removed from the ClipNode, only this assiciated mode is removed from
 the state set, instead of throwing away the whole state set.

In this way we have less surprising results if the state set of a clip node is
used for more state than just the clip state.
"
---
 src/osg/ClipNode.cpp | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/osg/ClipNode.cpp b/src/osg/ClipNode.cpp
index f445986b7..0e1ff763e 100644
--- a/src/osg/ClipNode.cpp
+++ b/src/osg/ClipNode.cpp
@@ -16,20 +16,25 @@
 
 using namespace osg;
 
-ClipNode::ClipNode()
+ClipNode::ClipNode():
+    _value(StateAttribute::ON)
 {
-    _value = StateAttribute::ON;
     _stateset = new StateSet;
 }
 
-ClipNode::ClipNode(const ClipNode& cn, const CopyOp& copyop):Group(cn,copyop)
+ClipNode::ClipNode(const ClipNode& cn, const CopyOp& copyop):
+    Group(cn,copyop),
+    _value(cn._value)
 {
     for(ClipPlaneList::const_iterator itr=cn._planes.begin();
         itr!=cn._planes.end();
         ++itr)
     {
         ClipPlane* plane = dynamic_cast<ClipPlane*>(copyop(itr->get()));
-        if (plane) addClipPlane(plane);
+        if (!plane)
+            continue;
+        _planes.push_back(plane);
+        _stateset->setAssociatedModes(plane, _value);
     }
 }
 
@@ -41,17 +46,22 @@ ClipNode::~ClipNode()
 void ClipNode::createClipBox(const BoundingBox& bb,unsigned int clipPlaneNumberBase)
 {
     _planes.clear();
+    if (!_stateset.valid()) _stateset = new osg::StateSet;
 
     _planes.push_back(new ClipPlane(clipPlaneNumberBase  ,1.0,0.0,0.0,-bb.xMin()));
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
     _planes.push_back(new ClipPlane(clipPlaneNumberBase+1,-1.0,0.0,0.0,bb.xMax()));
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
 
     _planes.push_back(new ClipPlane(clipPlaneNumberBase+2,0.0,1.0,0.0,-bb.yMin()));
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
     _planes.push_back(new ClipPlane(clipPlaneNumberBase+3,0.0,-1.0,0.0,bb.yMax()));
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
 
     _planes.push_back(new ClipPlane(clipPlaneNumberBase+4,0.0,0.0,1.0,-bb.zMin()));
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
     _planes.push_back(new ClipPlane(clipPlaneNumberBase+5,0.0,0.0,-1.0,bb.zMax()));
-
-    setLocalStateSetModes(_value);
+    _stateset->setAssociatedModes(_planes.back().get(), _value);
 }
 
 // Add a ClipPlane to a ClipNode. Return true if plane is added, 
@@ -62,9 +72,10 @@ bool ClipNode::addClipPlane(ClipPlane* clipplane)
 
     if (std::find(_planes.begin(),_planes.end(),clipplane)==_planes.end())
     {
-        // clipplane doesn't exist in list so add it.
+        // cliplane doesn't exist in list so add it.
         _planes.push_back(clipplane);
-        setLocalStateSetModes(_value);
+        if (!_stateset.valid()) _stateset = new osg::StateSet;
+        _stateset->setAssociatedModes(clipplane, _value);
         return true;
     }
     else
@@ -82,9 +93,9 @@ bool ClipNode::removeClipPlane(ClipPlane* clipplane)
     ClipPlaneList::iterator itr = std::find(_planes.begin(),_planes.end(),clipplane);
     if (itr!=_planes.end())
     {
-        // clipplane exist in list so erase it.
+        // cliplane exist in list so erase it.
+        _stateset->removeAssociatedModes(clipplane);
         _planes.erase(itr);
-        setLocalStateSetModes(_value);
         return true;
     }
     else
@@ -99,8 +110,10 @@ bool ClipNode::removeClipPlane(unsigned int pos)
 {
     if (pos<_planes.size())
     {
-        _planes.erase(_planes.begin()+pos);
-        setLocalStateSetModes(_value);
+        ClipPlaneList::iterator itr = _planes.begin();
+        std::advance(itr, pos);
+        _stateset->removeAssociatedModes(itr->get());
+        _planes.erase(itr);
         return true;
     }
     else
@@ -122,8 +135,8 @@ void ClipNode::setStateSetModes(StateSet& stateset,StateAttribute::GLModeValue v
 
 void ClipNode::setLocalStateSetModes(const StateAttribute::GLModeValue value)
 {
+    _value = value;
     if (!_stateset) _stateset = new StateSet;
-    _stateset->clear();
     setStateSetModes(*_stateset,value);
 }