Added support to slideshow3D for -s commandline option allow the size of
the display to be specified. Also implementaited some code for display position and speed info in osgProducer::Viewer, not fully implemented yet.
This commit is contained in:
@@ -48,8 +48,9 @@ void DisplaySettings::copy(const DisplaySettings& vs)
|
||||
_displayType = vs._displayType;
|
||||
_stereoMode = vs._stereoMode;
|
||||
_eyeSeparation = vs._eyeSeparation;
|
||||
_screenDistance = vs._screenDistance;
|
||||
_screenWidth = vs._screenWidth;
|
||||
_screenHeight = vs._screenHeight;
|
||||
_screenDistance = vs._screenDistance;
|
||||
|
||||
_splitStereoHorizontalEyeMapping = vs._splitStereoHorizontalEyeMapping;
|
||||
_splitStereoHorizontalSeparation = vs._splitStereoHorizontalSeparation;
|
||||
@@ -89,8 +90,9 @@ void DisplaySettings::setDefaults()
|
||||
_stereo = false;
|
||||
_stereoMode = ANAGLYPHIC;
|
||||
_eyeSeparation = 0.05f;
|
||||
_screenDistance = 0.5f;
|
||||
_screenWidth = 0.325f;
|
||||
_screenHeight = 0.26f;
|
||||
_screenDistance = 0.5f;
|
||||
|
||||
_splitStereoHorizontalEyeMapping = LEFT_EYE_LEFT_VIEWPORT;
|
||||
_splitStereoHorizontalSeparation = 0;
|
||||
@@ -200,9 +202,9 @@ void DisplaySettings::readEnvironmentalVariables()
|
||||
_eyeSeparation = atof(ptr);
|
||||
}
|
||||
|
||||
if( (ptr = getenv("OSG_SCREEN_DISTANCE")) != 0)
|
||||
if( (ptr = getenv("OSG_SCREEN_WIDTH")) != 0)
|
||||
{
|
||||
_screenDistance = atof(ptr);
|
||||
_screenWidth = atof(ptr);
|
||||
}
|
||||
|
||||
if( (ptr = getenv("OSG_SCREEN_HEIGHT")) != 0)
|
||||
@@ -210,6 +212,11 @@ void DisplaySettings::readEnvironmentalVariables()
|
||||
_screenHeight = atof(ptr);
|
||||
}
|
||||
|
||||
if( (ptr = getenv("OSG_SCREEN_DISTANCE")) != 0)
|
||||
{
|
||||
_screenDistance = atof(ptr);
|
||||
}
|
||||
|
||||
if( (ptr = getenv("OSG_SPLIT_STEREO_HORIZONTAL_EYE_MAPPING")) != 0)
|
||||
{
|
||||
if (strcmp(ptr,"LEFT_EYE_LEFT_VIEWPORT")==0)
|
||||
|
||||
Reference in New Issue
Block a user