FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for setting texture units in the new TexGenNode.

Browse Source
This commit is contained in:
Robert Osfield
2004-06-17 14:02:15 +00:00
parent 840d5d4930
commit 06aa06d686
7 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/osg/TexGenNode
View File

@@ -32,25 +32,26 @@ class SG_EXPORT TexGenNode : public Group
META_Node(osg, TexGenNode);
void setTextureUnit(unsigned int textureUnit) { _textureUnit = textureUnit; }
unsigned int getTextureUnit() const { return _textureUnit; }
/** Set the TexGen.*/
void setTexGen(TexGen* texgen);
/** Get the TexGen.*/
inline TexGen* getTexGen() { return _texgen.get(); }
/** Get the const TexGen.*/
inline const TexGen* getTexGen() const { return _texgen.get(); }
/** Set the GLModes on StateSet associated with the TexGen.*/
void setStateSetModes(StateSet&,StateAttribute::GLModeValue) const;
/** Set up the local StateSet */
void setLocalStateSetModes(StateAttribute::GLModeValue=StateAttribute::ON);
protected:
virtual ~TexGenNode();
unsigned int _textureUnit;
StateAttribute::GLModeValue _value;
osg::ref_ptr<TexGen> _texgen;
};

9
include/osgUtil/CullVisitor
View File

@@ -170,6 +170,9 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStac
/** Add an attribute which is positioned related to the modelview matrix.*/
inline void addPositionedAttribute(osg::RefMatrix* matrix,const osg::StateAttribute* attr);
/** Add an attribute which is positioned related to the modelview matrix.*/
inline void addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr);
/** reimplement CullStack's popProjectionMatrix() adding clamping of the projection matrix to the computed near and far.*/
virtual void popProjectionMatrix();
@@ -351,6 +354,12 @@ inline void CullVisitor::addPositionedAttribute(osg::RefMatrix* matrix,const osg
_currentRenderBin->_stage->addPositionedAttribute(matrix,attr);
}
/** Add an attribute which is positioned related to the modelview matrix.*/
inline void CullVisitor::addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr)
{
_currentRenderBin->_stage->addPositionedTextureAttribute(textureUnit,matrix,attr);
}
inline RenderLeaf* CullVisitor::createOrReuseRenderLeaf(osg::Drawable* drawable,osg::RefMatrix* projection,osg::RefMatrix* matrix, float depth)
{
// skip of any already reused renderleaf.

5
include/osgUtil/RenderStage
View File

@@ -117,6 +117,11 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
getRenderStageLighting()->addPositionedAttribute(matrix,attr);
}
virtual void addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr)
{
getRenderStageLighting()->addPositionedTextureAttribute(textureUnit, matrix,attr);
}
virtual void drawPreRenderStages(osg::State& state,RenderLeaf*& previous);
virtual void draw(osg::State& state,RenderLeaf*& previous);

11
include/osgUtil/RenderStageLighting
View File

@@ -41,18 +41,25 @@ class OSGUTIL_EXPORT RenderStageLighting : public osg::Object
virtual void reset();
typedef std::pair< const osg::StateAttribute*, osg::ref_ptr<osg::RefMatrix> > AttrMatrixPair;
typedef std::vector< AttrMatrixPair > AttrMatrixList;
typedef std::vector< AttrMatrixPair > AttrMatrixList;
typedef std::map< unsigned int, AttrMatrixList > TexUnitAttrMatrixListMap;
virtual void addPositionedAttribute(osg::RefMatrix* matrix,const osg::StateAttribute* attr)
{
_attrList.push_back(AttrMatrixPair(attr,matrix));
}
virtual void addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr)
{
_texAttrListMap[textureUnit].push_back(AttrMatrixPair(attr,matrix));
}
virtual void draw(osg::State& state,RenderLeaf*& previous);
public:
AttrMatrixList _attrList;
AttrMatrixList _attrList;
TexUnitAttrMatrixListMap _texAttrListMap;
protected: