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

Turn the scaling transformation into providing three scaling factors (x, y, z)

Browse Source 
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
This commit is contained in:
Alexander Bock
2020-05-12 15:27:24 +02:00
parent 3b427bfd15
commit f7170a9506
17 changed files with 172 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/scenegraphnode.h
+4 -4
View File
@@ -122,13 +122,13 @@ public:
glm::dvec3 position() const;
const glm::dmat3& rotationMatrix() const;
double scale() const;
glm::dvec3 scale() const;
glm::dvec3 worldPosition() const;
const glm::dmat3& worldRotationMatrix() const;
glm::dmat4 modelTransform() const;
glm::dmat4 inverseModelTransform() const;
double worldScale() const;
glm::dvec3 worldScale() const;
bool isTimeFrameActive(const Time& time) const;
SceneGraphNode* parent() const;
@@ -152,7 +152,7 @@ public:
private:
glm::dvec3 calculateWorldPosition() const;
glm::dmat3 calculateWorldRotation() const;
double calculateWorldScale() const;
glm::dvec3 calculateWorldScale() const;
void computeScreenSpaceData(RenderData& newData);
std::atomic<State> _state = State::Loaded;
@@ -185,7 +185,7 @@ private:
// Cached transform data
glm::dvec3 _worldPositionCached = glm::dvec3(0.0);
glm::dmat3 _worldRotationCached = glm::dmat3(1.0);
double _worldScaleCached = 1.0;
glm::dvec3 _worldScaleCached = glm::dvec3(1.0);
float _fixedBoundingSphere = 0.f;