mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 02:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed member variable of SimpleSphereGeometry from _planet to _sphere

Browse Source
This commit is contained in:
Alexander Bock
2015-02-16 22:13:03 +01:00
parent 17f6d376be
commit bb5f6e1bca
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/rendering/planets/simplespheregeometry.h
View File

@@ -52,7 +52,7 @@ private:
properties::Vec2Property _radius;
properties::IntProperty _segments;
PowerScaledSphere* _planet;
PowerScaledSphere* _sphere;
};
} // namespace planetgeometry

18
src/rendering/planets/simplespheregeometry.cpp
View File

@@ -46,7 +46,7 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
, _radius("radius", "Radius", glm::vec2(1.f, 0.f), glm::vec2(-10.f, -20.f),
glm::vec2(10.f, 20.f))
, _segments("segments", "Segments", 20, 1, 50)
, _planet(nullptr)
, _sphere(nullptr)
{
using constants::scenegraphnode::keyName;
using constants::simplespheregeometry::keyRadius;
@@ -94,14 +94,14 @@ bool SimpleSphereGeometry::initialize(RenderablePlanet* parent)
void SimpleSphereGeometry::deinitialize()
{
if (_planet)
delete _planet;
_planet = nullptr;
if (_sphere)
delete _sphere;
_sphere = nullptr;
}
void SimpleSphereGeometry::render()
{
_planet->render();
_sphere->render();
}
void SimpleSphereGeometry::createSphere()
@@ -111,11 +111,11 @@ void SimpleSphereGeometry::createSphere()
PowerScaledScalar planetSize(_radius);
_parent->setBoundingSphere(planetSize);
if(_planet)
delete _planet;
if(_sphere)
delete _sphere;
_planet = new PowerScaledSphere(planetSize, _segments);
_planet->initialize();
_sphere = new PowerScaledSphere(planetSize, _segments);
_sphere->initialize();
}
} // namespace planetgeometry