Hi Robert,
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.
This change depends on the StateSet::removaAssociatedModes change I have
posted a few minutes ago.
The change is also based on rev 7595.
Please apply.
Greetings
Mathias
--
Dr. Mathias Fröhlich, science + computing ag, Software Solutions
Hagellocher Weg 71-75, D-72070 Tuebingen, Germany
Phone: +49 7071 9457-268, Fax: +49 7071 9457-511
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Florian Geyer,
Dr. Roland Niemeier, Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Prof. Dr. Hanns Ruder
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
#include <osg/ClipNode>
#include <algorithm>
using namespace osg;
ClipNode::ClipNode():
_value(StateAttribute::ON)
{
_stateset = new StateSet;
}
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)
continue;
_planes.push_back(plane);
_stateset->setAssociatedModes(plane, _value);
}
}
ClipNode::~ClipNode()
{
}
// Create a 6 clip planes to create a clip box.
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()));
_stateset->setAssociatedModes(_planes.back().get(), _value);
}
// Add a ClipPlane to a ClipNode. Return true if plane is added,
// return false if plane already exists in ClipNode, or clipplane is false.
bool ClipNode::addClipPlane(ClipPlane* clipplane)
{
if (!clipplane) return false;
if (std::find(_planes.begin(),_planes.end(),clipplane)==_planes.end())
{
// cliplane doesn't exist in list so add it.
_planes.push_back(clipplane);
if (!_stateset.valid()) _stateset = new osg::StateSet;
_stateset->setAssociatedModes(clipplane, _value);
return true;
}
else
{
return false;
}
}
// Remove ClipPlane from a ClipNode. Return true if plane is removed,
// return false if plane does not exists in ClipNode.
bool ClipNode::removeClipPlane(ClipPlane* clipplane)
{
if (!clipplane) return false;
ClipPlaneList::iterator itr = std::find(_planes.begin(),_planes.end(),clipplane);
if (itr!=_planes.end())
{
// cliplane exist in list so erase it.
_stateset->removeAssociatedModes(clipplane);
_planes.erase(itr);
return true;
}
else
{
return false;
}
}
// Remove ClipPlane, at specified index, from a ClipNode. Return true if plane is removed,
// return false if plane does not exists in ClipNode.
bool ClipNode::removeClipPlane(unsigned int pos)
{
if (pos<_planes.size())
{
ClipPlaneList::iterator itr = _planes.begin();
std::advance(itr, pos);
_stateset->removeAssociatedModes(itr->get());
_planes.erase(itr);
return true;
}
else
{
return false;
}
}
// Set the GLModes on StateSet associated with the ClipPlanes.
void ClipNode::setStateSetModes(StateSet& stateset,StateAttribute::GLModeValue value) const
{
for(ClipPlaneList::const_iterator itr=_planes.begin();
itr!=_planes.end();
++itr)
{
stateset.setAssociatedModes(itr->get(),value);
}
}
void ClipNode::setLocalStateSetModes(const StateAttribute::GLModeValue value)
{
_value = value;
if (!_stateset) _stateset = new StateSet;
setStateSetModes(*_stateset,value);
}
BoundingSphere ClipNode::computeBound() const
{
return Group::computeBound();
}
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
