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

From Andreas Goebel, (submitted by Paul Martz) "A fix for the FLT exporter. This change adds support for normals with OVERALL binding (and improves support for normals with PER_PRIMITIVE binding -- still not correct, but at least it doesn't index off the end of the array anymore)."

Browse Source
This commit is contained in:
Robert Osfield
2008-12-10 10:13:58 +00:00
parent 33782a5177
commit 69f5e5c5e5
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
View File

@@ -279,33 +279,47 @@ VertexPaletteManager::writeRecords( const osg::Vec3dArray* v, const osg::Vec4Arr
_vertices->writeInt16( flags ); // Flags
_vertices->writeVec3d( (*v)[ idx ] ); // Vertex
// Now write record-specific field.
// Now write record-specific fields.
switch( recType )
{
case VERTEX_C:
{
_vertices->writeInt32( packedColor ); // Packed color
_vertices->writeUInt32( 0 ); // Vertex color index
break;
}
case VERTEX_CN:
_vertices->writeVec3f( (*n)[ idx ] ); // Normal
{
if (!normalPerVertex) // Normal
_vertices->writeVec3f( (*n)[ 0 ] );
else
_vertices->writeVec3f( (*n)[ idx ] );
_vertices->writeInt32( packedColor ); // Packed color
_vertices->writeUInt32( 0 ); // Vertex color index
if (_fltOpt.getFlightFileVersionNumber() > ExportOptions::VERSION_15_7)
_vertices->writeUInt32( 0 ); // Reserved
break;
}
case VERTEX_CNT:
_vertices->writeVec3f( (*n)[ idx ] ); // Normal
{
if (!normalPerVertex) // Normal
_vertices->writeVec3f( (*n)[ 0 ] );
else
_vertices->writeVec3f( (*n)[ idx ] );
_vertices->writeVec2f( (*t)[ idx ] ); // Tex coord
_vertices->writeInt32( packedColor ); // Packed color
_vertices->writeUInt32( 0 ); // Vertex color index
_vertices->writeUInt32( 0 ); // Reserved
break;
}
case VERTEX_CT:
{
_vertices->writeVec2f( (*t)[ idx ] ); // Tex coord
_vertices->writeInt32( packedColor ); // Packed color
_vertices->writeUInt32( 0 ); // Vertex color index
break;
}
}
}
}