ba3d Object + accessor fct geo()

GUI/ba3d/model/object.cpp

@@ -95,7 +95,14 @@ void Object::addExtrinsicRotation(F3 turn, F3 scale, F3& rotate, F3 rotateExtrin
 
 void Object::releaseGeometry()
 {
-    geo.reset();
+    m_geo.reset();
+}
+
+const Geometry& Object::geo()
+{
+    if (!m_geo)
+        m_geo = geometryStore().getGeometry(gky);
+    return *m_geo;
 }
 
 void Object::draw(Canvas& canvas)
@@ -103,9 +110,7 @@ void Object::draw(Canvas& canvas)
     if (isNull)
         return;
 
-    if (!geo)
-        geo = geometryStore().getGeometry(gky);
-    canvas.draw(color, mat, *geo);
+    canvas.draw(color, mat, geo());
 }
 
 } // namespace GUI::RealSpace

GUI/ba3d/model/object.h

@@ -41,6 +41,7 @@ public:
     void transform(F3 turn, F3 scale, F3 rotate, F3 translate);
 
     void addExtrinsicRotation(F3 turn, F3 scale, F3& rotate, F3 rotateExtrinsic, F3& translate);
+    const Geometry& geo();
 
 protected:
     bool isNull;
@@ -49,7 +50,7 @@ private:
     Model* model;
 
     GeometricID::Key gky;
-    GeometryHandle geo;     // retrieved on demand
+    GeometryHandle m_geo;     // retrieved on demand
     void releaseGeometry(); // can be released whenever
 
     QMatrix4x4 mat;