Changeset 9509 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

01/17/09 18:23:47 (4 years ago)

Author:

robert

Message:

Updated event callback to be able to update iso surface value.

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -458 +458 @@
 
 
+struct ScaleOperator
+{
+    ScaleOperator():_scale(1.0f) {}
+    ScaleOperator(float scale):_scale(scale) {}
+    ScaleOperator(const ScaleOperator& so):_scale(so._scale) {}
+    
+    ScaleOperator& operator = (const ScaleOperator& so) { _scale = so._scale; return *this; }
+
+    float _scale;
+
+    inline void luminance(float& l) const { l*= _scale; } 
+    inline void alpha(float& a) const { a*= _scale; } 
+    inline void luminance_alpha(float& l,float& a) const { l*= _scale; a*= _scale;  } 
+    inline void rgb(float& r,float& g,float& b) const { r*= _scale; g*=_scale; b*=_scale; }
+    inline void rgba(float& r,float& g,float& b,float& a) const { r*= _scale; g*=_scale; b*=_scale; a*=_scale; }
+};
+
+struct RecordRowOperator
+{
+    RecordRowOperator(unsigned int num):_colours(num),_pos(0) {}
+
+    mutable std::vector<osg::Vec4>  _colours;
+    mutable unsigned int            _pos;
+    
+    inline void luminance(float l) const { rgba(l,l,l,1.0f); } 
+    inline void alpha(float a) const { rgba(1.0f,1.0f,1.0f,a); } 
+    inline void luminance_alpha(float l,float a) const { rgba(l,l,l,a);  } 
+    inline void rgb(float r,float g,float b) const { rgba(r,g,b,1.0f); }
+    inline void rgba(float r,float g,float b,float a) const { _colours[_pos++].set(r,g,b,a); }
+};
+
+struct WriteRowOperator
+{
+    WriteRowOperator():_pos(0) {}
+    WriteRowOperator(unsigned int num):_colours(num),_pos(0) {}
+
+    std::vector<osg::Vec4>  _colours;
+    mutable unsigned int    _pos;
+    
+    inline void luminance(float& l) const { l = _colours[_pos++].r(); } 
+    inline void alpha(float& a) const { a = _colours[_pos++].a(); } 
+    inline void luminance_alpha(float& l,float& a) const { l = _colours[_pos].r(); a = _colours[_pos++].a(); } 
+    inline void rgb(float& r,float& g,float& b) const { r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); }
+    inline void rgba(float& r,float& g,float& b,float& a) const {  r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); a = _colours[_pos++].a(); }
+};
+
+osg::Image* readRaw(int sizeX, int sizeY, int sizeZ, int numberBytesPerComponent, int numberOfComponents, const std::string& endian, const std::string& raw_filename)
+{
+    osgDB::ifstream fin(raw_filename.c_str(), std::ifstream::binary);
+    if (!fin) return 0;
+
+    GLenum pixelFormat;
+    switch(numberOfComponents)
+    {
+        case 1 : pixelFormat = GL_LUMINANCE; break;
+        case 2 : pixelFormat = GL_LUMINANCE_ALPHA; break;
+        case 3 : pixelFormat = GL_RGB; break;
+        case 4 : pixelFormat = GL_RGBA; break;
+        default :
+            osg::notify(osg::NOTICE)<<"Error: numberOfComponents="<<numberOfComponents<<" not supported, only 1,2,3 or 4 are supported."<<std::endl;
+            return 0;
+    }
+
+    
+    GLenum dataType;
+    switch(numberBytesPerComponent)
+    {
+        case 1 : dataType = GL_UNSIGNED_BYTE; break;
+        case 2 : dataType = GL_UNSIGNED_SHORT; break;
+        case 4 : dataType = GL_UNSIGNED_INT; break;
+        default : 
+            osg::notify(osg::NOTICE)<<"Error: numberBytesPerComponent="<<numberBytesPerComponent<<" not supported, only 1,2 or 4 are supported."<<std::endl;
+            return 0;
+    }
+    
+    int s_maximumTextureSize=256, t_maximumTextureSize=256, r_maximumTextureSize=256;
+    
+    int sizeS = sizeX;
+    int sizeT = sizeY;
+    int sizeR = sizeZ;
+    clampToNearestValidPowerOfTwo(sizeS, sizeT, sizeR, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize);
+
+    osg::ref_ptr<osg::Image> image = new osg::Image;
+    image->allocateImage(sizeS, sizeT, sizeR, pixelFormat, dataType);
+    
+    
+    bool endianSwap = (osg::getCpuByteOrder()==osg::BigEndian) ? (endian!="big") : (endian=="big");
+    
+    unsigned int r_offset = (sizeZ<sizeR) ? sizeR/2 - sizeZ/2 : 0;
+    
+    int offset = endianSwap ? numberBytesPerComponent : 0;
+    int delta = endianSwap ? -1 : 1;
+    for(int r=0;r<sizeZ;++r)
+    {
+        for(int t=0;t<sizeY;++t)
+        {
+            char* data = (char*) image->data(0,t,r+r_offset);
+            for(int s=0;s<sizeX;++s)
+            {
+                if (!fin) return 0;
+                
+                for(int c=0;c<numberOfComponents;++c)
+                {
+                    char* ptr = data+offset;
+                    for(int b=0;b<numberBytesPerComponent;++b)
+                    {
+                        fin.read((char*)ptr, 1);
+                        ptr += delta;
+                    }
+                    data += numberBytesPerComponent;
+                }
+            }
+        }
+    }
+
+
+    // normalise texture
+    {
+        // compute range of values
+        osg::Vec4 minValue, maxValue;
+        osg::computeMinMax(image.get(), minValue, maxValue);
+        osg::modifyImage(image.get(),ScaleOperator(1.0f/maxValue.r())); 
+    }
+    
+    
+    fin.close();
+
+    if (dataType!=GL_UNSIGNED_BYTE)
+    {
+        // need to convert to ubyte
+        
+        osg::ref_ptr<osg::Image> new_image = new osg::Image;
+        new_image->allocateImage(sizeS, sizeT, sizeR, pixelFormat, GL_UNSIGNED_BYTE);
+        
+        RecordRowOperator readOp(sizeS);
+        WriteRowOperator writeOp;
+
+        for(int r=0;r<sizeR;++r)
+        {
+            for(int t=0;t<sizeT;++t)
+            {
+                // reset the indices to beginning
+                readOp._pos = 0;
+                writeOp._pos = 0;
+            
+                // read the pixels into readOp's _colour array
+                osg::readRow(sizeS, pixelFormat, dataType, image->data(0,t,r), readOp);
+                                
+                // pass readOp's _colour array contents over to writeOp (note this is just a pointer swap).
+                writeOp._colours.swap(readOp._colours);
+                
+                osg::modifyRow(sizeS, pixelFormat, GL_UNSIGNED_BYTE, new_image->data(0,t,r), writeOp);
+
+                // return readOp's _colour array contents back to its rightful owner.
+                writeOp._colours.swap(readOp._colours);
+            }
+        }
+        
+        image = new_image;
+    }
+    
+    return image.release();
+    
+    
+}
+
+enum ColourSpaceOperation
+{
+    NO_COLOUR_SPACE_OPERATION,
+    MODULATE_ALPHA_BY_LUMINANCE,
+    MODULATE_ALPHA_BY_COLOUR,
+    REPLACE_ALPHA_WITH_LUMINANACE,
+    REPLACE_RGB_WITH_LUMINANCE
+};
+
+struct ModulateAlphaByLuminanceOperator
+{
+    ModulateAlphaByLuminanceOperator() {}
+
+    inline void luminance(float&) const {} 
+    inline void alpha(float&) const {} 
+    inline void luminance_alpha(float& l,float& a) const { a*= l; } 
+    inline void rgb(float&,float&,float&) const {}
+    inline void rgba(float& r,float& g,float& b,float& a) const { float l = (r+g+b)*0.3333333; a *= l;}
+};
+
+struct ModulateAlphaByColourOperator
+{
+    ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
+    
+    osg::Vec4 _colour;
+    float _lum;
+
+    inline void luminance(float&) const {} 
+    inline void alpha(float&) const {} 
+    inline void luminance_alpha(float& l,float& a) const { a*= l*_lum; } 
+    inline void rgb(float&,float&,float&) const {}
+    inline void rgba(float& r,float& g,float& b,float& a) const { a = (r*_colour.r()+g*_colour.g()+b*_colour.b()+a*_colour.a()); }
+};
+
+struct ReplaceAlphaWithLuminanceOperator
+{
+    ReplaceAlphaWithLuminanceOperator() {}
+
+    inline void luminance(float&) const {} 
+    inline void alpha(float&) const {} 
+    inline void luminance_alpha(float& l,float& a) const { a= l; } 
+    inline void rgb(float&,float&,float&) const { }
+    inline void rgba(float& r,float& g,float& b,float& a) const { float l = (r+g+b)*0.3333333; a = l; }
+};
+
+osg::Image* doColourSpaceConversion(ColourSpaceOperation op, osg::Image* image, osg::Vec4& colour)
+{
+    switch(op)
+    {
+        case (MODULATE_ALPHA_BY_LUMINANCE):
+        {
+            std::cout<<"doing conversion MODULATE_ALPHA_BY_LUMINANCE"<<std::endl;
+            osg::modifyImage(image,ModulateAlphaByLuminanceOperator()); 
+            return image;
+        }
+        case (MODULATE_ALPHA_BY_COLOUR):
+        {
+            std::cout<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
+            osg::modifyImage(image,ModulateAlphaByColourOperator(colour)); 
+            return image;
+        }
+        case (REPLACE_ALPHA_WITH_LUMINANACE):
+        {
+            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
+            osg::modifyImage(image,ReplaceAlphaWithLuminanceOperator()); 
+            return image;
+        }
+        case (REPLACE_RGB_WITH_LUMINANCE):
+        {
+            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
+            osg::Image* newImage = new osg::Image;
+            newImage->allocateImage(image->s(), image->t(), image->r(), GL_LUMINANCE, image->getDataType());
+            osg::copyImage(image, 0, 0, 0, image->s(), image->t(), image->r(),
+                           newImage, 0, 0, 0, false);
+            return newImage;
+        }
+        default:
+            return image;
+    }
+}
+
+
+osg::TransferFunction1D* readTransferFunctionFile(const std::string& filename)
+{
+    std::string foundFile = osgDB::findDataFile(filename);
+    if (foundFile.empty()) 
+    {
+        std::cout<<"Error: could not find transfer function file : "<<filename<<std::endl;
+        return 0;
+    }
+    
+    std::cout<<"Reading transfer function "<<filename<<std::endl;
+
+    osg::TransferFunction1D::ValueMap valueMap;
+    osgDB::ifstream fin(foundFile.c_str());
+    while(fin)
+    {
+        float value, red, green, blue, alpha;
+        fin >> value >> red >> green >> blue >> alpha;
+        if (fin) 
+        {
+            std::cout<<"value = "<<value<<" ("<<red<<", "<<green<<", "<<blue<<", "<<alpha<<")"<<std::endl;
+            valueMap[value] = osg::Vec4(red,green,blue,alpha);
+        }
+    }
+    
+    if (valueMap.empty())
+    {
+        std::cout<<"Error: No values read from transfer function file: "<<filename<<std::endl;
+        return 0;
+    }
+    
+    osg::TransferFunction1D* tf = new osg::TransferFunction1D;
+    tf->assign(valueMap, true);
+    
+    return tf;
+}
+
+
 class FollowMouseCallback : public osgGA::GUIEventHandler, public osg::StateSet::Callback
 {
     public:
     
-        FollowMouseCallback(bool shader = false):
-            _shader(shader)
+        FollowMouseCallback()
         {
             _updateTransparency = false;
@@ -474 +758 @@
         META_Object(osg,FollowMouseCallback);
 
-        virtual void operator() (osg::StateSet* stateset, osg::NodeVisitor* nv)
-        {
-            if (nv->getVisitorType()==osg::NodeVisitor::EVENT_VISITOR)
-            {
-                osgGA::EventVisitor* ev = dynamic_cast<osgGA::EventVisitor*>(nv);
-                if (ev)
-                {
-                    osgGA::GUIActionAdapter* aa = ev->getActionAdapter();
-                    osgGA::EventQueue::Events& events = ev->getEvents();
-                    for(osgGA::EventQueue::Events::iterator itr=events.begin();
-                        itr!=events.end();
-                        ++itr)
-                    {
-                        handle(*(*itr), *aa, stateset, ev);
-                    }
-                }
-            }
-        }
-        
         virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&, osg::Object* object, osg::NodeVisitor*)
         {
-            osg::StateSet* stateset = dynamic_cast<osg::StateSet*>(object);
-            if (!stateset) return false;
+            osgVolume::VolumeTile* tile = dynamic_cast<osgVolume::VolumeTile*>(object);
+            osgVolume::Layer* layer = tile ? tile->getLayer() : 0;
+            osgVolume::Property* property = layer ? layer->getProperty() : 0;
+            if (!property) return false;
+                        
+            osgVolume::CollectPropertiesVisitor cpv;
+            property->accept(cpv);
             
             switch(ea.getEventType())
@@ -504 +774 @@
                 {
                     float v = (ea.getY()-ea.getYmin())/(ea.getYmax()-ea.getYmin());
-                    if (_shader)
+
+                    if (_updateAlphaCutOff && cpv._isoProperty.valid())
                     {
-                        osg::Uniform* uniform = 0;
-                        if (_updateTransparency && (uniform = stateset->getUniform("transparency"))) uniform->set(v);
-                        if (_updateAlphaCutOff && (uniform = stateset->getUniform("alphaCutOff"))) uniform->set(v);
-                        if (_updateSampleDensity && (uniform = stateset->getUniform("sampleDensity"))) 
-                        {
-                            float value = powf(v,5);
-                            osg::notify(osg::INFO)<<"sampleDensity = "<<value<<std::endl;
-                            uniform->set(value);
-                        }
+                        osg::notify(osg::NOTICE)<<"Setting isoProperty to "<<v<<std::endl;
+                        cpv._isoProperty->setValue(v);
                     }
-                    else
-                    {                    
-                        if (_updateAlphaCutOff)
-                        {
-                            osg::AlphaFunc* alphaFunc = dynamic_cast<osg::AlphaFunc*>(stateset->getAttribute(osg::StateAttribute::ALPHAFUNC));
-                            if (alphaFunc) 
-                            {
-                                alphaFunc->setReferenceValue(v);
-                            }
-                        }
-                        
-                        if (_updateTransparency)
-                        {
-                            osg::Material* material = dynamic_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
-                            if (material)
-                            {
-                                material->setAlpha(osg::Material::FRONT_AND_BACK,v);
-                            }
-                        }
+
+                    if (_updateAlphaCutOff && cpv._afProperty.valid())
+                    {
+                        cpv._afProperty->setValue(v);
                     }
-
-                    break;
                 }
                 case(osgGA::GUIEventAdapter::KEYDOWN):
@@ -559 +806 @@
         }
         
-        bool _shader;
         bool _updateTransparency;
         bool _updateAlphaCutOff;
         bool _updateSampleDensity;
-
 };
-
-struct ScaleOperator
-{
-    ScaleOperator():_scale(1.0f) {}
-    ScaleOperator(float scale):_scale(scale) {}
-    ScaleOperator(const ScaleOperator& so):_scale(so._scale) {}
-    
-    ScaleOperator& operator = (const ScaleOperator& so) { _scale = so._scale; return *this; }
-
-    float _scale;
-
-    inline void luminance(float& l) const { l*= _scale; } 
-    inline void alpha(float& a) const { a*= _scale; } 
-    inline void luminance_alpha(float& l,float& a) const { l*= _scale; a*= _scale;  } 
-    inline void rgb(float& r,float& g,float& b) const { r*= _scale; g*=_scale; b*=_scale; }
-    inline void rgba(float& r,float& g,float& b,float& a) const { r*= _scale; g*=_scale; b*=_scale; a*=_scale; }
-};
-
-struct RecordRowOperator
-{
-    RecordRowOperator(unsigned int num):_colours(num),_pos(0) {}
-
-    mutable std::vector<osg::Vec4>  _colours;
-    mutable unsigned int            _pos;
-    
-    inline void luminance(float l) const { rgba(l,l,l,1.0f); } 
-    inline void alpha(float a) const { rgba(1.0f,1.0f,1.0f,a); } 
-    inline void luminance_alpha(float l,float a) const { rgba(l,l,l,a);  } 
-    inline void rgb(float r,float g,float b) const { rgba(r,g,b,1.0f); }
-    inline void rgba(float r,float g,float b,float a) const { _colours[_pos++].set(r,g,b,a); }
-};
-
-struct WriteRowOperator
-{
-    WriteRowOperator():_pos(0) {}
-    WriteRowOperator(unsigned int num):_colours(num),_pos(0) {}
-
-    std::vector<osg::Vec4>  _colours;
-    mutable unsigned int    _pos;
-    
-    inline void luminance(float& l) const { l = _colours[_pos++].r(); } 
-    inline void alpha(float& a) const { a = _colours[_pos++].a(); } 
-    inline void luminance_alpha(float& l,float& a) const { l = _colours[_pos].r(); a = _colours[_pos++].a(); } 
-    inline void rgb(float& r,float& g,float& b) const { r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); }
-    inline void rgba(float& r,float& g,float& b,float& a) const {  r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); a = _colours[_pos++].a(); }
-};
-
-osg::Image* readRaw(int sizeX, int sizeY, int sizeZ, int numberBytesPerComponent, int numberOfComponents, const std::string& endian, const std::string& raw_filename)
-{
-    osgDB::ifstream fin(raw_filename.c_str(), std::ifstream::binary);
-    if (!fin) return 0;
-
-    GLenum pixelFormat;
-    switch(numberOfComponents)
-    {
-        case 1 : pixelFormat = GL_LUMINANCE; break;
-        case 2 : pixelFormat = GL_LUMINANCE_ALPHA; break;
-        case 3 : pixelFormat = GL_RGB; break;
-        case 4 : pixelFormat = GL_RGBA; break;
-        default :
-            osg::notify(osg::NOTICE)<<"Error: numberOfComponents="<<numberOfComponents<<" not supported, only 1,2,3 or 4 are supported."<<std::endl;
-            return 0;
-    }
-
-    
-    GLenum dataType;
-    switch(numberBytesPerComponent)
-    {
-        case 1 : dataType = GL_UNSIGNED_BYTE; break;
-        case 2 : dataType = GL_UNSIGNED_SHORT; break;
-        case 4 : dataType = GL_UNSIGNED_INT; break;
-        default : 
-            osg::notify(osg::NOTICE)<<"Error: numberBytesPerComponent="<<numberBytesPerComponent<<" not supported, only 1,2 or 4 are supported."<<std::endl;
-            return 0;
-    }
-    
-    int s_maximumTextureSize=256, t_maximumTextureSize=256, r_maximumTextureSize=256;
-    
-    int sizeS = sizeX;
-    int sizeT = sizeY;
-    int sizeR = sizeZ;
-    clampToNearestValidPowerOfTwo(sizeS, sizeT, sizeR, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize);
-
-    osg::ref_ptr<osg::Image> image = new osg::Image;
-    image->allocateImage(sizeS, sizeT, sizeR, pixelFormat, dataType);
-    
-    
-    bool endianSwap = (osg::getCpuByteOrder()==osg::BigEndian) ? (endian!="big") : (endian=="big");
-    
-    unsigned int r_offset = (sizeZ<sizeR) ? sizeR/2 - sizeZ/2 : 0;
-    
-    int offset = endianSwap ? numberBytesPerComponent : 0;
-    int delta = endianSwap ? -1 : 1;
-    for(int r=0;r<sizeZ;++r)
-    {
-        for(int t=0;t<sizeY;++t)
-        {
-            char* data = (char*) image->data(0,t,r+r_offset);
-            for(int s=0;s<sizeX;++s)
-            {
-                if (!fin) return 0;
-                
-                for(int c=0;c<numberOfComponents;++c)
-                {
-                    char* ptr = data+offset;
-                    for(int b=0;b<numberBytesPerComponent;++b)
-                    {
-                        fin.read((char*)ptr, 1);
-                        ptr += delta;
-                    }
-                    data += numberBytesPerComponent;
-                }
-            }
-        }
-    }
-
-
-    // normalise texture
-    {
-        // compute range of values
-        osg::Vec4 minValue, maxValue;
-        osg::computeMinMax(image.get(), minValue, maxValue);
-        osg::modifyImage(image.get(),ScaleOperator(1.0f/maxValue.r())); 
-    }
-    
-    
-    fin.close();
-
-    if (dataType!=GL_UNSIGNED_BYTE)
-    {
-        // need to convert to ubyte
-        
-        osg::ref_ptr<osg::Image> new_image = new osg::Image;
-        new_image->allocateImage(sizeS, sizeT, sizeR, pixelFormat, GL_UNSIGNED_BYTE);
-        
-        RecordRowOperator readOp(sizeS);
-        WriteRowOperator writeOp;
-
-        for(int r=0;r<sizeR;++r)
-        {
-            for(int t=0;t<sizeT;++t)
-            {
-                // reset the indices to beginning
-                readOp._pos = 0;
-                writeOp._pos = 0;
-            
-                // read the pixels into readOp's _colour array
-                osg::readRow(sizeS, pixelFormat, dataType, image->data(0,t,r), readOp);
-                                
-                // pass readOp's _colour array contents over to writeOp (note this is just a pointer swap).
-                writeOp._colours.swap(readOp._colours);
-                
-                osg::modifyRow(sizeS, pixelFormat, GL_UNSIGNED_BYTE, new_image->data(0,t,r), writeOp);
-
-                // return readOp's _colour array contents back to its rightful owner.
-                writeOp._colours.swap(readOp._colours);
-            }
-        }
-        
-        image = new_image;
-    }
-    
-    return image.release();
-    
-    
-}
-
-enum ColourSpaceOperation
-{
-    NO_COLOUR_SPACE_OPERATION,
-    MODULATE_ALPHA_BY_LUMINANCE,
-    MODULATE_ALPHA_BY_COLOUR,
-    REPLACE_ALPHA_WITH_LUMINANACE,
-    REPLACE_RGB_WITH_LUMINANCE
-};
-
-struct ModulateAlphaByLuminanceOperator
-{
-    ModulateAlphaByLuminanceOperator() {}
-
-    inline void luminance(float&) const {} 
-    inline void alpha(float&) const {} 
-    inline void luminance_alpha(float& l,float& a) const { a*= l; } 
-    inline void rgb(float&,float&,float&) const {}
-    inline void rgba(float& r,float& g,float& b,float& a) const { float l = (r+g+b)*0.3333333; a *= l;}
-};
-
-struct ModulateAlphaByColourOperator
-{
-    ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
-    
-    osg::Vec4 _colour;
-    float _lum;
-
-    inline void luminance(float&) const {} 
-    inline void alpha(float&) const {} 
-    inline void luminance_alpha(float& l,float& a) const { a*= l*_lum; } 
-    inline void rgb(float&,float&,float&) const {}
-    inline void rgba(float& r,float& g,float& b,float& a) const { a = (r*_colour.r()+g*_colour.g()+b*_colour.b()+a*_colour.a()); }
-};
-
-struct ReplaceAlphaWithLuminanceOperator
-{
-    ReplaceAlphaWithLuminanceOperator() {}
-
-    inline void luminance(float&) const {} 
-    inline void alpha(float&) const {} 
-    inline void luminance_alpha(float& l,float& a) const { a= l; } 
-    inline void rgb(float&,float&,float&) const { }
-    inline void rgba(float& r,float& g,float& b,float& a) const { float l = (r+g+b)*0.3333333; a = l; }
-};
-
-osg::Image* doColourSpaceConversion(ColourSpaceOperation op, osg::Image* image, osg::Vec4& colour)
-{
-    switch(op)
-    {
-        case (MODULATE_ALPHA_BY_LUMINANCE):
-        {
-            std::cout<<"doing conversion MODULATE_ALPHA_BY_LUMINANCE"<<std::endl;
-            osg::modifyImage(image,ModulateAlphaByLuminanceOperator()); 
-            return image;
-        }
-        case (MODULATE_ALPHA_BY_COLOUR):
-        {
-            std::cout<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
-            osg::modifyImage(image,ModulateAlphaByColourOperator(colour)); 
-            return image;
-        }
-        case (REPLACE_ALPHA_WITH_LUMINANACE):
-        {
-            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
-            osg::modifyImage(image,ReplaceAlphaWithLuminanceOperator()); 
-            return image;
-        }
-        case (REPLACE_RGB_WITH_LUMINANCE):
-        {
-            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
-            osg::Image* newImage = new osg::Image;
-            newImage->allocateImage(image->s(), image->t(), image->r(), GL_LUMINANCE, image->getDataType());
-            osg::copyImage(image, 0, 0, 0, image->s(), image->t(), image->r(),
-                           newImage, 0, 0, 0, false);
-            return newImage;
-        }
-        default:
-            return image;
-    }
-}
-
-
-osg::TransferFunction1D* readTransferFunctionFile(const std::string& filename)
-{
-    std::string foundFile = osgDB::findDataFile(filename);
-    if (foundFile.empty()) 
-    {
-        std::cout<<"Error: could not find transfer function file : "<<filename<<std::endl;
-        return 0;
-    }
-    
-    std::cout<<"Reading transfer function "<<filename<<std::endl;
-
-    osg::TransferFunction1D::ValueMap valueMap;
-    osgDB::ifstream fin(foundFile.c_str());
-    while(fin)
-    {
-        float value, red, green, blue, alpha;
-        fin >> value >> red >> green >> blue >> alpha;
-        if (fin) 
-        {
-            std::cout<<"value = "<<value<<" ("<<red<<", "<<green<<", "<<blue<<", "<<alpha<<")"<<std::endl;
-            valueMap[value] = osg::Vec4(red,green,blue,alpha);
-        }
-    }
-    
-    if (valueMap.empty())
-    {
-        std::cout<<"Error: No values read from transfer function file: "<<filename<<std::endl;
-        return 0;
-    }
-    
-    osg::TransferFunction1D* tf = new osg::TransferFunction1D;
-    tf->assign(valueMap, true);
-    
-    return tf;
-}
 
 
@@ -1378 +1339 @@
         tile->setLayer(layer.get());
         
+        tile->setEventCallback(new FollowMouseCallback());
+        
         if (useShader)
         {