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

From Aric Aumann, fixed handling of null texture coordinates

Browse Source
This commit is contained in:
Robert Osfield 2009-03-23 20:25:51 +00:00
parent 73bf2a7de9
commit fb83a47d78
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgPlugins/x/ReaderWriterDirectX.cpp
View File

@ -155,8 +155,6 @@ osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Mesh & mesh,
const DX::MeshTextureCoords* meshTexCoords = mesh.getMeshTextureCoords();
//std::cerr << "texcoord=" << meshTexCoords << std::endl;
if (!meshTexCoords)
return NULL;
/*
* - MeshMaterialList contains a list of Material and a per-face
@ -288,7 +286,8 @@ osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Mesh & mesh,
osg::Vec3Array* vertexArray = (osg::Vec3Array*) geom->getVertexArray();
osg::Vec3Array* normalArray = (osg::Vec3Array*) geom->getNormalArray();
osg::Vec2Array* texCoordArray = (osg::Vec2Array*) geom->getTexCoordArray(0);
osg::Vec2Array* texCoordArray=NULL; // only make them if the original has them
if(meshTexCoords) texCoordArray = (osg::Vec2Array*) geom->getTexCoordArray(0);
// Add vertices, normals, texcoords
for (unsigned int j = 0; j < np; j++) {