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

Fixed image allocation operations.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14713 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-23 20:28:37 +00:00
parent 8bb91a5265
commit b6f05114dc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osg/TransferFunction.cpp
View File

@@ -48,14 +48,15 @@ TransferFunction1D::TransferFunction1D(const TransferFunction1D& tf, const CopyO
TransferFunction(tf,copyop)
{
allocate(tf.getNumberImageCells());
assign(_colorMap);
assign(tf._colorMap);
}
void TransferFunction1D::allocate(unsigned int numX)
{
_image = new osg::Image;
_image->allocateImage(numX,1,1,GL_RGBA, GL_FLOAT);
if (!_colorMap.empty()) assign(_colorMap);
updateImage();
}
void TransferFunction1D::clear(const osg::Vec4& color)
@@ -177,7 +178,7 @@ osg::Vec4 TransferFunction1D::getColor(float v) const
void TransferFunction1D::assign(const ColorMap& newColours)
{
_colorMap = newColours;
if (&_colorMap != &newColours) _colorMap = newColours;
updateImage();
}