Removing more CppCheck warnings

This commit is contained in:
Alexander Bock
2016-07-28 20:31:53 +02:00
parent 4068ec747b
commit 0c3b2c55d9
34 changed files with 214 additions and 239 deletions
+4 -9
View File
@@ -54,24 +54,19 @@ PlanetGeometry* PlanetGeometry::createFromDictionary(const ghoul::Dictionary& di
}
PlanetGeometry::PlanetGeometry()
//: _parent(nullptr)
: _parent(nullptr)
{
setName("PlanetGeometry");
}
PlanetGeometry::~PlanetGeometry()
{
}
PlanetGeometry::~PlanetGeometry() {}
bool PlanetGeometry::initialize(Renderable* parent)
{
bool PlanetGeometry::initialize(Renderable* parent) {
_parent = parent;
return true;
}
void PlanetGeometry::deinitialize()
{
}
void PlanetGeometry::deinitialize() {}
} // namespace planetgeometry
} // namespace openspace
+5 -3
View File
@@ -552,14 +552,16 @@ void RenderableStars::createDataSlice(ColorOption option) {
position[0], position[1], position[2], position[3]
} };
layout.value.bvColor = _fullData[i + 3];
layout.value.luminance = _fullData[i + 4];
layout.value.absoluteMagnitude = _fullData[i + 5];
#ifdef USING_STELLAR_TEST_GRID
layout.value.bvColor = _fullData[i + 3];
layout.value.luminance = _fullData[i + 3];
layout.value.absoluteMagnitude = _fullData[i + 3];
#else
layout.value.bvColor = _fullData[i + 3];
layout.value.luminance = _fullData[i + 4];
layout.value.absoluteMagnitude = _fullData[i + 5];
#endif
_slicedData.insert(_slicedData.end(),
@@ -71,6 +71,10 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
, _vBufferID(0)
, _needsSweep(true)
, _oldTime(std::numeric_limits<double>::max())
, _tropic(0.f)
, _ratio(0.f)
, _day(0.f)
, _increment(0.f)
{
_successfullDictionaryFetch &= dictionary.getValue(keyBody, _target);
_successfullDictionaryFetch &= dictionary.getValue(keyObserver, _observer);