mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 02:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

Browse Source 
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp
This commit is contained in:
Jonas Strandstedt
2014-09-26 17:17:18 +02:00
parent 2d359fd48c 4cea480882
commit 5427dbdeb2
36 changed files with 1033 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/openspace/rendering/renderable.h
View File

@@ -34,7 +34,7 @@
#include <ghoul/misc/dictionary.h>
#include <ghoul/opengl/programobject.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/util/runtimedata.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
@@ -52,8 +52,8 @@ public:
void setBoundingSphere(const PowerScaledScalar& boundingSphere);
const PowerScaledScalar& getBoundingSphere();
virtual void render(const Camera* camera, const psc& thisPosition, RuntimeData* runtimeData) = 0;
virtual void update();
virtual void render(const RenderData& data) = 0;
virtual void update(const UpdateData& data);
bool isVisible() const;
@@ -65,7 +65,6 @@ private:
properties::BoolProperty _enabled;
PowerScaledScalar boundingSphere_;
RuntimeData* _runtimeData;
std::string _relativePath;
};