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

Minor various fixes

Browse Source
This commit is contained in:
Alexander Bock
2017-04-12 14:21:02 -04:00
parent 5e7302822b
commit bef337c0eb
7 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/scene/rotation.h
View File

@@ -27,7 +27,7 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
#include <memory>
@@ -35,6 +35,8 @@ namespace ghoul { class Dictionary; }
namespace openspace {
struct UpdateData;
namespace documentation { struct Documentation; }
class Rotation : public properties::PropertyOwner {
@@ -42,7 +44,7 @@ public:
static std::unique_ptr<Rotation> createFromDictionary(const ghoul::Dictionary& dictionary);
Rotation(const ghoul::Dictionary& dictionary);
virtual ~Rotation();
virtual ~Rotation() = default;
virtual bool initialize();
const glm::dmat3& matrix() const;
virtual void update(const UpdateData& data);

9
include/openspace/scene/scale.h
View File

@@ -27,11 +27,16 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
#include <memory>
namespace ghoul { class Dictionary; }
namespace openspace {
struct UpdateData;
namespace documentation { struct Documentation; };
class Scale : public properties::PropertyOwner {
@@ -39,7 +44,7 @@ public:
static std::unique_ptr<Scale> createFromDictionary(const ghoul::Dictionary& dictionary);
Scale();
virtual ~Scale();
virtual ~Scale() = default;
virtual bool initialize();
virtual double scaleValue() const = 0;
virtual void update(const UpdateData& data);

7
include/openspace/scene/translation.h
View File

@@ -27,14 +27,17 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
#include <functional>
#include <memory>
namespace ghoul { class Dictionary; }
namespace openspace {
struct UpdateData;
namespace documentation { struct Documentation; }
class Translation : public properties::PropertyOwner {
@@ -42,7 +45,7 @@ public:
static std::unique_ptr<Translation> createFromDictionary(const ghoul::Dictionary& dictionary);
Translation();
virtual ~Translation();
virtual ~Translation() = default;
virtual bool initialize();
virtual glm::dvec3 position() const = 0;