Show
Ignore:
Timestamp:
11/26/14 20:05:09 (80 minutes ago)
Author:
robert
Message:

Windows build fix

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgViewer/View

    r13429 r13890  
    4444 
    4545        META_Object(osgViewer,ViewConfig); 
    46          
     46 
    4747        /** configure method that is overridden by Config subclasses.*/ 
    4848        virtual void configure(osgViewer::View& /*view*/) const {} 
    49          
     49 
    5050        /** convinience method for getting the relavent display settings to use.*/ 
    5151        virtual osg::DisplaySettings* getActiveDisplaySetting(osgViewer::View& view) const; 
     
    130130        const osgDB::ImagePager* getImagePager() const; 
    131131 
    132         
     132 
    133133        /** Add a Device. 
    134134         * The Device is polled on each new frame via it's Device::checkEvents() method and any events generated then collected via Device::getEventQueue()*/ 
     
    168168 
    169169 
    170         typedef std::list< osg::ref_ptr<osgGA::GUIEventHandler> > EventHandlers; 
     170        typedef std::list< osg::ref_ptr<osgGA::EventHandler> > EventHandlers; 
    171171 
    172172        /** Add an EventHandler that adds handling of events to the View.*/ 
    173         void addEventHandler(osgGA::GUIEventHandler* eventHandler); 
     173        void addEventHandler(osgGA::EventHandler* eventHandler); 
    174174 
    175175        /** Remove an EventHandler from View.*/ 
    176         void removeEventHandler(osgGA::GUIEventHandler* eventHandler); 
     176        void removeEventHandler(osgGA::EventHandler* eventHandler); 
    177177 
    178178        /** Get the View's list of EventHandlers.*/ 
     
    217217        float getFusionDistanceValue() const { return _fusionDistanceValue; } 
    218218 
    219          
     219 
    220220        /** Apply a viewer configuration to set up Cameras and Windowing. */ 
    221221        void apply(ViewConfig* config); 
    222          
     222 
    223223        ViewConfig* getLastAppliedViewConfig() { return _lastAppliedViewConfig.get(); } 
    224224        const ViewConfig* getLastAppliedViewConfig() const { return _lastAppliedViewConfig.get(); } 
    225          
    226          
     225 
     226 
    227227        /** deprecated, use view.apply(new osgViewer::AcrossAllWindows()). */ 
    228228        void setUpViewAcrossAllScreens(); 
     
    243243        void setUpViewForWoWVxDisplay(unsigned int screenNum, unsigned char wow_content, unsigned char wow_factor, unsigned char wow_offset, float wow_disparity_Zd, float wow_disparity_vz, float wow_disparity_M, float wow_disparity_C); 
    244244 
    245          
     245 
    246246 
    247247        /** Convenience method for setting up depth partitioning on the specified camera.*/ 
     
    255255        bool containsCamera(const osg::Camera* camera) const; 
    256256 
    257          
     257 
    258258        /** deprecated. */ 
    259259        const osg::Camera* getCameraContainingPosition(float x, float y, float& local_x, float& local_y) const; 
     
    265265        bool computeIntersections(float x,float y, const osg::NodePath& nodePath, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask = 0xffffffff); 
    266266 
    267          
     267 
    268268        /** Compute intersections of a ray, starting the current mouse position, through the specified camera. */ 
    269269        bool computeIntersections(const osgGA::GUIEventAdapter& ea, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask = 0xffffffff); 
     
    272272        bool computeIntersections(const osgGA::GUIEventAdapter& ea, const osg::NodePath& nodePath, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask = 0xffffffff); 
    273273 
    274          
     274 
    275275        /** Compute intersections of a ray through the specified camera. */ 
    276276        bool computeIntersections(const osg::Camera* camera, osgUtil::Intersector::CoordinateFrame cf, float x,float y, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask = 0xffffffff); 
     
    285285 
    286286    public: 
    287          
     287 
    288288        osg::Texture* createDistortionTexture(int width, int height); 
    289289        osg::Camera* assignRenderToTextureCamera(osg::GraphicsContext* gc, int width, int height, osg::Texture* texture); 
     
    301301            double _eyeScale; 
    302302        }; 
    303          
     303 
    304304 
    305305    public: 
     
    335335 
    336336        osg::ref_ptr<ViewConfig>                _lastAppliedViewConfig; 
    337          
     337 
    338338}; 
    339339