Show
Ignore:
Timestamp:
07/03/09 21:16:53 (3 years ago)
Author:
robert
Message:

Added Dragger::s/getActivationModKeyMask(..) and Dragger::s/getActivationKeyEvent(...) methods to make it possible to have draggers that only respond when you press a specified modified key or standard key.

Changed the optional dragger in osgvolume to require the shift key to be pressed for the dragger to become active.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgVolume/RayTracedTechnique.cpp

    r10445 r10454  
    460460        osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator); 
    461461        masterLocator->addCallback(locatorCallback.get()); 
    462         layerLocator->addCallback(locatorCallback.get()); 
     462        if (masterLocator != layerLocator) layerLocator->addCallback(locatorCallback.get()); 
    463463 
    464464        stateset->setTextureAttributeAndModes(0, texgen, osg::StateAttribute::ON);