Changeset 7968

Timestamp:

03/18/08 16:37:38 (5 years ago)

Author:

robert

Message:

To osg::AutoTransform? added support for MinimumScale?, MaximumScale? and AutoScaleTransitionWidth? parameters
and a new scheme for computing the scaling when using autoscale that introduces smooth
transitions to the scaling of the subgraph so that it looks more natural.

Location:

OpenSceneGraph/trunk

Files:

• examples/osgautotransform/osgautotransform.cpp (modified) (3 diffs)
• include/osg/AutoTransform (modified) (2 diffs)
• src/osg/AutoTransform.cpp (modified) (3 diffs)
• src/osgPlugins/ive/AutoTransform.cpp (modified) (2 diffs)
• src/osgPlugins/ive/IveVersion.h (modified) (1 diff)
• src/osgPlugins/osg/AutoTransform.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgautotransform/osgautotransform.cpp

@@ -29 +29 @@
 #include <osg/Geometry>
 
+#include <osgDB/WriteFile>
+
 #include <osgText/Text>
 
@@ -113 +115 @@
         geom->setVertexArray(vertices);
         geom->setColorArray(colors);
+        geom->setColorBinding(osg::Geometry::BIND_OVERALL);
         geom->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP,0,vertices->size()));
 
@@ -139 +142 @@
         geom->setVertexArray(vertices);
         geom->setColorArray(colors);
+        geom->setColorBinding(osg::Geometry::BIND_OVERALL);
         geom->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP,0,vertices->size()));
 

OpenSceneGraph/trunk/include/osg/AutoTransform

@@ -84 +84 @@
         bool getAutoScaleToScreen() const { return _autoScaleToScreen; }
 
+        void setAutoScaleTransistionWidthRatio(float ratio) { _autoScaleTransitionWidthRatio = ratio; }
+        float getAutoScaleTransistionWidthRatio() const { return _autoScaleTransitionWidthRatio; }
+
 
         virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor* nv) const;
@@ -116 +119 @@
         float                           _minimumScale;
         float                           _maximumScale;
-
+        float                           _autoScaleTransitionWidthRatio;
 
         void computeMatrix() const;

OpenSceneGraph/trunk/src/osg/AutoTransform.cpp

@@ -26 +26 @@
     _minimumScale(0.0f),
     _maximumScale(FLT_MAX),
+    _autoScaleTransitionWidthRatio(0.25f),
     _matrixDirty(true)
 {
@@ -43 +44 @@
     _minimumScale(pat._minimumScale),
     _maximumScale(pat._maximumScale),
+    _autoScaleTransitionWidthRatio(pat._autoScaleTransitionWidthRatio),
     _matrixDirty(true)
 {
@@ -179 +181 @@
                     {
                         float size = 1.0f/cs->pixelSize(getPosition(),0.48f);
-                        
-                        if (size<_minimumScale) size = _minimumScale;
-                        if (size>_maximumScale) size = _maximumScale;
+
+                        if (_autoScaleTransitionWidthRatio>0.0f)
+                        { 
+                            if (_minimumScale>0.0f)
+                            {
+                                float j = _minimumScale;
+                                float i = (_maximumScale<FLT_MAX) ? 
+                                            _minimumScale+(_maximumScale-_minimumScale)*_autoScaleTransitionWidthRatio :
+                                            _minimumScale*(1.0f+_autoScaleTransitionWidthRatio);
+                                float c = 1.0f/(4.0f*(i-j));
+                                float b = 1.0f - 2.0f*c*i;
+                                float a = j + b*b / (4.0f*c);
+                                float k = -b / (2.0f*c);
+
+                                if (size<k) size = _minimumScale;
+                                else if (size<i) size = a + b*size + c*(size*size);
+                            }
+
+                            if (_maximumScale<FLT_MAX)
+                            {
+                                float n = _maximumScale;
+                                float m = (_minimumScale>0.0) ?
+                                            _maximumScale+(_minimumScale-_maximumScale)*_autoScaleTransitionWidthRatio :
+                                            _maximumScale*(1.0f-_autoScaleTransitionWidthRatio);
+                                float c = 1.0f / (4.0f*(m-n));
+                                float b = 1.0f - 2.0f*c*m;
+                                float a = n + b*b/(4.0f*c);
+                                float p = -b / (2.0f*c);
+
+                                if (size>p) size = _maximumScale;
+                                else if (size>m) size = a + b*size + c*(size*size);
+                            }        
+                        }
                         
                         setScale(size);

OpenSceneGraph/trunk/src/osgPlugins/ive/AutoTransform.cpp

@@ -38 +38 @@
     out->writeBool(getAutoScaleToScreen());
 
+    if ( out->getVersion() >= VERSION_0025 )
+    {
+        out->writeFloat(getMinimumScale());
+        out->writeFloat(getMaximumScale());
+        out->writeFloat(getAutoScaleTransistionWidthRatio());
+    }
+
     out->writeQuat(getRotation());
     out->writeVec3(getScale());
+    
 }
 
@@ -65 +73 @@
         setAutoScaleToScreen(in->readBool());
 
+        if ( in->getVersion() >= VERSION_0025 )
+        {
+            setMinimumScale(in->readFloat());
+            setMaximumScale(in->readFloat());
+            setAutoScaleTransistionWidthRatio(in->readFloat());
+        }
+
         setRotation(in->readQuat());
         setScale(in->readVec3());
+
+
     }
     else{

OpenSceneGraph/trunk/src/osgPlugins/ive/IveVersion.h

@@ -34 +34 @@
 #define VERSION_0023 23
 #define VERSION_0024 24
+#define VERSION_0025 25
 
-#define VERSION VERSION_0024
+#define VERSION VERSION_0025
 
 /* The BYTE_SEX tag is used to check the endian

OpenSceneGraph/trunk/src/osgPlugins/osg/AutoTransform.cpp

@@ -141 +141 @@
     }
 
+    if (fr.matchSequence("autoScaleTransistionWidthRatio %f"))
+    {
+        float ratio;
+        fr[1].getFloat(ratio);
+        
+        transform.setAutoScaleTransistionWidthRatio(ratio);
+
+        fr += 2;
+        iteratorAdvanced = true;
+    }
+
+
     return iteratorAdvanced;
 }
@@ -168 +180 @@
     }
 
-
     fw.indent()<<"autoScaleToScreen "<<(transform.getAutoScaleToScreen()?"TRUE":"FALSE")<<std::endl;
-
+    
+    if (transform.getAutoScaleTransistionWidthRatio()!=0.25) 
+    {
+            fw.indent()<<"autoScaleTransistionWidthRatio "<<transform.getAutoScaleTransistionWidthRatio()<<std::endl;
+    }
+    
     return true;
 }