Skip to content
Snippets Groups Projects
Commit a9453d7d authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

ba3d geo -> const/mutable

parent 1ceb9a9a
No related branches found
No related tags found
1 merge request!1067break include cycle in ba3d
...@@ -98,7 +98,7 @@ void Object::releaseGeometry() ...@@ -98,7 +98,7 @@ void Object::releaseGeometry()
m_geo.reset(); m_geo.reset();
} }
const Geometry& Object::geo() const Geometry& Object::geo() const
{ {
if (!m_geo) if (!m_geo)
m_geo = geometryStore().getGeometry(gky); m_geo = geometryStore().getGeometry(gky);
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
void setColor(QColor color) { m_color = color; } void setColor(QColor color) { m_color = color; }
bool valid() const { return !isNull; } bool valid() const { return !isNull; }
const Geometry& geo(); const Geometry& geo() const;
const QMatrix4x4& matrix() const { return m_matrix; } const QMatrix4x4& matrix() const { return m_matrix; }
protected: protected:
...@@ -54,7 +54,7 @@ private: ...@@ -54,7 +54,7 @@ private:
QColor m_color; QColor m_color;
Model* model; Model* model;
GeometricID::Key gky; GeometricID::Key gky;
GeometryHandle m_geo; // retrieved on demand mutable GeometryHandle m_geo; // retrieved on demand
QMatrix4x4 m_matrix; QMatrix4x4 m_matrix;
void releaseGeometry(); // can be released whenever void releaseGeometry(); // can be released whenever
......
...@@ -58,6 +58,7 @@ public: ...@@ -58,6 +58,7 @@ public:
Camera* cam() { return camera; } Camera* cam() { return camera; }
// void drawObject(const Object
private: private:
QRect viewport; QRect viewport;
float aspectRatio, colorBgR, colorBgG, colorBgB; float aspectRatio, colorBgR, colorBgG, colorBgB;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment