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

Cleaned up per context buffers support

Browse Source
This commit is contained in:
Robert Osfield
2006-07-26 15:29:26 +00:00
parent 8e1efaed7f
commit d9b6d87d5a
13 changed files with 202 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/DisplaySettings
View File

@@ -168,8 +168,8 @@ class OSG_EXPORT DisplaySettings : public osg::Referenced
bool getAccumBuffer() const { return (_minimumNumberAccumRedBits+_minimumNumberAccumGreenBits+_minimumNumberAccumBlueBits+_minimumNumberAccumAlphaBits)!=0; }
void setMaxNumberOfGraphicsContexts(unsigned int num) { _maxNumOfGraphicsContexts = num; }
unsigned int getMaxNumberOfGraphicsContexts() const { return _maxNumOfGraphicsContexts; }
void setMaxNumberOfGraphicsContexts(unsigned int num);
unsigned int getMaxNumberOfGraphicsContexts() const;
void setNumMultiSamples(unsigned int samples) { _numMultiSamples = samples; }
unsigned int getNumMultiSamples() const { return _numMultiSamples; }

2
include/osg/Texture
View File

@@ -719,7 +719,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
};
typedef std::list< ref_ptr<TextureObject> > TextureObjectList;
typedef std::map<unsigned int, TextureObjectList > TextureObjectListMap;
typedef osg::buffered_object<TextureObjectList> TextureObjectListMap;
/** Takes the active texture objects from the Texture and places them
* in the specified TextureObjectListMap. */

8
include/osg/buffered_value
View File

@@ -31,6 +31,10 @@ class buffered_value
_array(DisplaySettings::instance()->getMaxNumberOfGraphicsContexts(),0)
{}
inline buffered_value(unsigned int size):
_array(size,0)
{}
buffered_value& operator = (const buffered_value& rhs)
{
_array = rhs._array;
@@ -77,6 +81,10 @@ class buffered_object
_array(DisplaySettings::instance()->getMaxNumberOfGraphicsContexts())
{}
inline buffered_object(unsigned int size):
_array(size)
{}
buffered_object& operator = (const buffered_object& rhs)
{
_array = rhs._array;