mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 16:59:37 -05:00
Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes
This commit is contained in:
@@ -54,7 +54,7 @@ PlanetGeometry* PlanetGeometry::createFromDictionary(const ghoul::Dictionary& di
|
||||
}
|
||||
|
||||
PlanetGeometry::PlanetGeometry()
|
||||
: _parent(nullptr)
|
||||
//: _parent(nullptr)
|
||||
{
|
||||
setName("PlanetGeometry");
|
||||
}
|
||||
@@ -63,7 +63,7 @@ PlanetGeometry::~PlanetGeometry()
|
||||
{
|
||||
}
|
||||
|
||||
bool PlanetGeometry::initialize(RenderablePlanet* parent)
|
||||
bool PlanetGeometry::initialize(Renderable* parent)
|
||||
{
|
||||
_parent = parent;
|
||||
return true;
|
||||
|
||||
@@ -39,12 +39,12 @@ public:
|
||||
|
||||
PlanetGeometry();
|
||||
virtual ~PlanetGeometry();
|
||||
virtual bool initialize(RenderablePlanet* parent);
|
||||
virtual bool initialize(Renderable* parent);
|
||||
virtual void deinitialize();
|
||||
virtual void render() = 0;
|
||||
|
||||
protected:
|
||||
RenderablePlanet* _parent;
|
||||
Renderable* _parent;
|
||||
};
|
||||
|
||||
} // namespace planetgeometry
|
||||
|
||||
@@ -91,7 +91,7 @@ SimpleSphereGeometry::~SimpleSphereGeometry()
|
||||
{
|
||||
}
|
||||
|
||||
bool SimpleSphereGeometry::initialize(RenderablePlanet* parent)
|
||||
bool SimpleSphereGeometry::initialize(Renderable* parent)
|
||||
{
|
||||
bool success = PlanetGeometry::initialize(parent);
|
||||
createSphere();
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
namespace openspace {
|
||||
|
||||
class RenderablePlanet;
|
||||
class Renderable;
|
||||
class PowerScaledSphere;
|
||||
|
||||
namespace planetgeometry {
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
~SimpleSphereGeometry();
|
||||
|
||||
|
||||
bool initialize(RenderablePlanet* parent) override;
|
||||
bool initialize(Renderable* parent) override;
|
||||
void deinitialize() override;
|
||||
void render() override;
|
||||
PowerScaledSphere* _planet;
|
||||
|
||||
Reference in New Issue
Block a user