FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation if OSG ref_ptr implicit conversion is not enabled.

Browse Source
This commit is contained in:
James Turner
2010-08-06 18:42:56 +01:00
parent 5376294389
commit 8690528080
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
simgear/scene/material/TextureBuilder.cxx
View File

@@ -570,43 +570,43 @@ Texture* CubeMapBuilder::build(Effect* effect, const SGPropertyNode* props,
// Choose correct image
switch(n) {
case 0: // Front
copySubImage(image, width, 0, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_Y, subimg);
copySubImage(image, width, 0, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_Y, subimg.get());
cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
break;
case 1: // Left
copySubImage(image, 0, height, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_X, subimg);
copySubImage(image, 0, height, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_X, subimg.get());
cubeTexture->setWrap(osg::Texture2D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
break;
case 2: // Top
copySubImage(image, width, height, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_Z, subimg);
copySubImage(image, width, height, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_Z, subimg.get());
cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
break;
case 3: // Right
copySubImage(image, width*2, height, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_X, subimg);
copySubImage(image, width*2, height, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::POSITIVE_X, subimg.get());
cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
break;
case 4: // Back
copySubImage(image, width, height*2, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Y, subimg);
copySubImage(image, width, height*2, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Y, subimg.get());
cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
break;
case 5: // Bottom
copySubImage(image, width, height*3, width, height, subimg, 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Z, subimg);
copySubImage(image, width, height*3, width, height, subimg.get(), 0, 0);
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Z, subimg.get());
cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);