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

Added missing initializers

Browse Source
This commit is contained in:
Robert Osfield
2016-06-27 09:40:48 +01:00
parent ce28b2e43e
commit 8fbf23f8c5
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osgPlugins/OpenFlight/AncillaryRecords.cpp
View File

@@ -276,20 +276,23 @@ class UVList : public Record
uint32 mask = in.readUInt32(0);
int numLayers = bitCount(mask);
int numVertices = (in.getRecordSize()-8) / (8 * numLayers);
for (int n=0; n < numVertices; ++n)
if (numLayers>0)
{
for (unsigned int layer=1; layer<8; layer++)
int numVertices = (in.getRecordSize()-8) / (8 * numLayers);
for (int n=0; n < numVertices; ++n)
{
uint32 layerBit = 0x80000000u >> (layer-1);
if (mask & layerBit)
for (unsigned int layer=1; layer<8; layer++)
{
float32 u = in.readFloat32();
float32 v = in.readFloat32();
uint32 layerBit = 0x80000000u >> (layer-1);
if (mask & layerBit)
{
float32 u = in.readFloat32();
float32 v = in.readFloat32();
// Add texture coordinates to geometry.
if (_parent.valid())
_parent->addVertexUV(layer,osg::Vec2(u,v));
// Add texture coordinates to geometry.
if (_parent.valid())
_parent->addVertexUV(layer,osg::Vec2(u,v));
}
}
}
}

4
src/osgPlugins/OpenFlight/AttrData.cpp
View File

@@ -97,8 +97,8 @@ AttrData::AttrData() :
{
of_mips[0]=of_mips[1]=of_mips[2]=of_mips[3]=of_mips[4]=of_mips[5]=of_mips[6]=of_mips[7]=0.0f;
}
/*
AttrData::AttrData(const AttrData& attr, const osg::CopyOp& copyop) :
osg::Object(attr,copyop)
{}
*/