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

Fix uninitialized var

Browse Source
This commit is contained in:
James Turner
2016-06-03 08:44:25 -05:00
parent b7b304ecfb
commit fb1b1b9c5e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/tgdb/TreeBin.cxx
+9 -9
View File
@@ -173,7 +173,7 @@ Geometry* createTreeGeometry(float width, float height, int varieties)
{ {
quadGeom->setSecondaryColorArray(new Vec3Array); quadGeom->setSecondaryColorArray(new Vec3Array);
quadGeom->setSecondaryColorBinding(Geometry::BIND_PER_VERTEX); quadGeom->setSecondaryColorBinding(Geometry::BIND_PER_VERTEX);
} }
FloatArray* rotation = new FloatArray(3); FloatArray* rotation = new FloatArray(3);
(*rotation)[0] = 0.0; (*rotation)[0] = 0.0;
(*rotation)[1] = PI_2; (*rotation)[1] = PI_2;
@@ -205,8 +205,8 @@ void addTreeToLeafGeode(Geode* geode, const SGVec3f& p, const SGVec3f& t)
Geometry* geom Geometry* geom
= static_cast<Geometry*>(geode->getDrawable(numDrawables - 1)); = static_cast<Geometry*>(geode->getDrawable(numDrawables - 1));
Vec3Array* posArray = static_cast<Vec3Array*>(geom->getColorArray()); Vec3Array* posArray = static_cast<Vec3Array*>(geom->getColorArray());
Vec3Array* tnormalArray; Vec3Array* tnormalArray = NULL;
if (use_tree_shadows || use_tree_normals) if (use_tree_shadows || use_tree_normals)
{tnormalArray = static_cast<Vec3Array*>(geom->getSecondaryColorArray());} {tnormalArray = static_cast<Vec3Array*>(geom->getSecondaryColorArray());}
if (posArray->size() if (posArray->size()
>= static_cast<Vec3Array*>(geom->getVertexArray())->size()) { >= static_cast<Vec3Array*>(geom->getVertexArray())->size()) {
@@ -215,12 +215,12 @@ void addTreeToLeafGeode(Geode* geode, const SGVec3f& p, const SGVec3f& t)
Vec3 params = (*paramsArray)[0]; Vec3 params = (*paramsArray)[0];
geom = createTreeGeometry(params.x(), params.y(), params.z()); geom = createTreeGeometry(params.x(), params.y(), params.z());
posArray = static_cast<Vec3Array*>(geom->getColorArray()); posArray = static_cast<Vec3Array*>(geom->getColorArray());
if (use_tree_shadows || use_tree_normals) if (use_tree_shadows || use_tree_normals)
{tnormalArray = static_cast<Vec3Array*>(geom->getSecondaryColorArray());} {tnormalArray = static_cast<Vec3Array*>(geom->getSecondaryColorArray());}
geode->addDrawable(geom); geode->addDrawable(geom);
} }
posArray->insert(posArray->end(), 4, pos); posArray->insert(posArray->end(), 4, pos);
if (use_tree_shadows || use_tree_normals) if (use_tree_shadows || use_tree_normals)
{tnormalArray->insert(tnormalArray->end(),4,ter);} {tnormalArray->insert(tnormalArray->end(),4,ter);}
size_t numVerts = posArray->size(); size_t numVerts = posArray->size();
int imax = 2; int imax = 2;
@@ -241,14 +241,14 @@ namespace
{ {
struct MakeTreesLeaf struct MakeTreesLeaf
{ {
MakeTreesLeaf(float range, int varieties, float width, float height, MakeTreesLeaf(float range, int varieties, float width, float height,
Effect* effect) : Effect* effect) :
_range(range), _varieties(varieties), _range(range), _varieties(varieties),
_width(width), _height(height), _effect(effect) {} _width(width), _height(height), _effect(effect) {}
MakeTreesLeaf(const MakeTreesLeaf& rhs) : MakeTreesLeaf(const MakeTreesLeaf& rhs) :
_range(rhs._range), _range(rhs._range),
_varieties(rhs._varieties), _width(rhs._width), _height(rhs._height), _varieties(rhs._varieties), _width(rhs._width), _height(rhs._height),
_effect(rhs._effect) _effect(rhs._effect)
{} {}
@@ -356,7 +356,7 @@ osg::Group* createForest(SGTreeBinList& forestList, const osg::Matrix& transform
MatrixTransform* mt = new MatrixTransform(transform); MatrixTransform* mt = new MatrixTransform(transform);
SGTreeBinList::iterator i; SGTreeBinList::iterator i;
use_tree_shadows = false; use_tree_shadows = false;
use_tree_normals = false; use_tree_normals = false;
if (options) { if (options) {
@@ -368,7 +368,7 @@ osg::Group* createForest(SGTreeBinList& forestList, const osg::Matrix& transform
use_tree_normals use_tree_normals
= propertyNode->getBoolValue("/sim/rendering/random-vegetation-normals", = propertyNode->getBoolValue("/sim/rendering/random-vegetation-normals",
use_tree_normals); use_tree_normals);
} }
} }
for (i = forestList.begin(); i != forestList.end(); ++i) { for (i = forestList.begin(); i != forestList.end(); ++i) {