mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 12:00:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into spicesolarsystem

Browse Source 
Conflicts:
	include/openspace/rendering/renderable.h
	include/openspace/rendering/renderablevolumecl.h
	include/openspace/rendering/renderablevolumeexpert.h
	include/openspace/rendering/renderablevolumegl.h
	include/openspace/rendering/renderengine.h
	include/openspace/scenegraph/ephemeris.h
	include/openspace/scenegraph/scenegraph.h
	include/openspace/scenegraph/spiceephemeris.h
	include/openspace/scenegraph/staticephemeris.h
	include/openspace/util/constants.h
	include/openspace/util/time.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablevolumecl.cpp
	src/rendering/renderablevolumeexpert.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/spiceephemeris.cpp
	src/scenegraph/staticephemeris.cpp
	src/util/factorymanager.cpp
	src/util/spicemanager.cpp
	src/util/time.cpp
This commit is contained in:
Jonas Strandstedt
2014-09-25 13:54:42 +02:00
parent 700f590a2a 82ff7fa984
commit 8042111ffe
135 changed files with 10855 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderable.h
+10 -3
View File
@@ -25,7 +25,9 @@
#ifndef __RENDERABLE_H__
#define __RENDERABLE_H__
// open space includes
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/powerscaledscalar.h>
#include <openspace/util/camera.h>
@@ -33,7 +35,6 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/util/runtimedata.h>
namespace openspace {
class Renderable : public properties::PropertyOwner {
@@ -53,11 +54,17 @@ public:
virtual void render(const Camera* camera, const psc& thisPosition, RuntimeData* runtimeData) = 0;
virtual void update();
bool isVisible() const;
protected:
// Renderable();
std::string findPath(const std::string& path);
private:
properties::BoolProperty _enabled;
PowerScaledScalar boundingSphere_;
RuntimeData* _runtimeData;
std::string _relativePath;
};
} // namespace openspace