Further work on improving stereo support in the OSG.
Renamed the osg::VisualsSettings to osg::DisplaySettings, and osgUtil::VisualsRequirementsVisitor to osgUtil::DisplayRequirementsVisitor. Added support for OSG_SCREEN_HEIGHT into osg::DisplaySettings, and added a DisplaySettings* to the constructors of osg::SceneView and osg::Camera.
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <osg/FrameStamp>
|
||||
#include <osg/Camera>
|
||||
#include <osg/VisualsSettings>
|
||||
#include <osg/DisplaySettings>
|
||||
|
||||
#include <vector>
|
||||
#include <map>
|
||||
@@ -108,20 +108,20 @@ class SG_EXPORT State : public Referenced
|
||||
/** Get the camera */
|
||||
inline const Camera* getCamera() const { return _camera.get(); }
|
||||
|
||||
/** Set the VisualsSettings. Note, nothing is applied, the visual settings are just used
|
||||
/** Set the DisplaySettings. Note, nothing is applied, the visual settings are just used
|
||||
* used in the State object to pass the current visual settings to Drawables
|
||||
* during rendering. */
|
||||
inline void setVisualsSettings(VisualsSettings* vs) { _visualsSettings = vs; }
|
||||
inline void setDisplaySettings(DisplaySettings* vs) { _displaySettings = vs; }
|
||||
|
||||
/** Get the VisualsSettings */
|
||||
inline const VisualsSettings* getVisualsSettings() const { return _visualsSettings.get(); }
|
||||
/** Get the DisplaySettings */
|
||||
inline const DisplaySettings* getDisplaySettings() const { return _displaySettings.get(); }
|
||||
|
||||
private:
|
||||
|
||||
unsigned int _contextID;
|
||||
ref_ptr<FrameStamp> _frameStamp;
|
||||
ref_ptr<Camera> _camera;
|
||||
ref_ptr<VisualsSettings> _visualsSettings;
|
||||
ref_ptr<DisplaySettings> _displaySettings;
|
||||
|
||||
typedef std::vector<StateAttribute::GLModeValue> ValueVec;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user