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

Fixed build errors when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to OFF

Browse Source
This commit is contained in:
Robert Osfield
2016-09-05 16:06:52 +01:00
parent 007a19a027
commit 66873b8c6c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/Drawable.cpp
View File

@@ -331,7 +331,7 @@ void Drawable::releaseGLObjects(State* state) const
}
}
VertexArrayState* vas = contextID <_vertexArrayStateList.size() ? _vertexArrayStateList[contextID] : 0;
VertexArrayState* vas = contextID <_vertexArrayStateList.size() ? _vertexArrayStateList[contextID].get() : 0;
if (vas)
{
vas->release();

2
src/osg/Shape.cpp
View File

@@ -1214,7 +1214,7 @@ Geometry* osg::convertShapeToGeometry(const Shape& shape, const TessellationHint
if (numColors>0)
{
ref_ptr<Vec4Array> colors = new Vec4Array(colorBinding);
geometry->setColorArray(colors);
geometry->setColorArray(colors.get());
for(unsigned int i=0; i<numColors; ++i)
{

2
src/osg/State.cpp
View File

@@ -174,7 +174,7 @@ void State::initializeExtensionProcs()
_isVertexBufferObjectSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES || osg::isGLExtensionSupported(_contextID,"GL_ARB_vertex_buffer_object");
_isVertexArrayObjectSupported = _glExtensions->isVAOSupported;
const DisplaySettings* ds = getDisplaySettings() ? getDisplaySettings() : osg::DisplaySettings::instance();
const DisplaySettings* ds = getDisplaySettings() ? getDisplaySettings() : osg::DisplaySettings::instance().get();
_forceVertexArrayObject = _isVertexArrayObjectSupported && (ds->getVertexBufferHint()==DisplaySettings::VERTEX_ARRAY_OBJECT);
_forceVertexBufferObject = _forceVertexArrayObject || (_isVertexBufferObjectSupported && (ds->getVertexBufferHint()==DisplaySettings::VERTEX_BUFFER_OBJECT));

2
src/osgSim/ImpostorSprite.cpp
View File

@@ -78,7 +78,7 @@ void ImpostorSprite::init()
colors->push_back(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
setVertexArray(_coords.get());
setColorArray(colors);
setColorArray(colors.get());
setTexCoordArray(0, _texcoords.get());
addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, 4));