Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on.

This commit is contained in:
Robert Osfield
2018-04-02 18:26:26 +01:00
parent 6c055e3400
commit f71513cab5
2 changed files with 8 additions and 26 deletions

View File

@@ -89,8 +89,7 @@ class OSG_EXPORT AutoTransform : public Transform
/** Get the front face direction normal. */
inline const Vec3& getNormal() const { return _normal; }
void setAutoScaleToScreen(bool autoScaleToScreen) { _autoScaleToScreen = autoScaleToScreen; }
void setAutoScaleToScreen(bool autoScaleToScreen);
bool getAutoScaleToScreen() const { return _autoScaleToScreen; }
void setAutoScaleTransitionWidthRatio(float ratio) { _autoScaleTransitionWidthRatio = ratio; }
@@ -101,9 +100,6 @@ class OSG_EXPORT AutoTransform : public Transform
virtual bool computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor* nv) const;
virtual BoundingSphere computeBound() const;
protected :
virtual ~AutoTransform() {}
@@ -125,9 +121,6 @@ class OSG_EXPORT AutoTransform : public Transform
osg::Matrixd computeMatrix(const osg::NodeVisitor* nv) const;
mutable bool _matrixInitalized;
mutable osg::Matrixd _cachedMatrix;
enum AxisAligned
{
AXIAL_ROT_X_AXIS=ROTATE_TO_AXIS+1,