Changeset 13041 for OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp
r12324 r13041 1 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 39 39 } 40 40 41 41 42 42 DisplaySettings& DisplaySettings::operator = (const DisplaySettings& vs) 43 43 { … … 62 62 _splitStereoVerticalEyeMapping = vs._splitStereoVerticalEyeMapping; 63 63 _splitStereoVerticalSeparation = vs._splitStereoVerticalSeparation; 64 64 65 65 _splitStereoAutoAdjustAspectRatio = vs._splitStereoAutoAdjustAspectRatio; 66 66 … … 77 77 _maxNumOfGraphicsContexts = vs._maxNumOfGraphicsContexts; 78 78 _numMultiSamples = vs._numMultiSamples; 79 79 80 80 _compileContextsHint = vs._compileContextsHint; 81 81 _serializeDrawDispatch = vs._serializeDrawDispatch; 82 82 83 83 _numDatabaseThreadsHint = vs._numDatabaseThreadsHint; 84 84 _numHttpDatabaseThreadsHint = vs._numHttpDatabaseThreadsHint; 85 85 86 86 _application = vs._application; 87 87 … … 101 101 { 102 102 if (_stereo || vs._stereo) _stereo = true; 103 103 104 104 // need to think what to do about merging the stereo mode. 105 105 106 106 if (_doubleBuffer || vs._doubleBuffer) _doubleBuffer = true; 107 107 if (_RGB || vs._RGB) _RGB = true; 108 108 if (_depthBuffer || vs._depthBuffer) _depthBuffer = true; 109 109 110 110 if (vs._minimumNumberAlphaBits>_minimumNumberAlphaBits) _minimumNumberAlphaBits = vs._minimumNumberAlphaBits; 111 111 if (vs._minimumNumberStencilBits>_minimumNumberStencilBits) _minimumNumberStencilBits = vs._minimumNumberStencilBits; … … 123 123 if (vs._maxBufferObjectPoolSize>_maxBufferObjectPoolSize) _maxBufferObjectPoolSize = vs._maxBufferObjectPoolSize; 124 124 125 // these are bit masks so merging them is like logical or 125 // these are bit masks so merging them is like logical or 126 126 _implicitBufferAttachmentRenderMask |= vs._implicitBufferAttachmentRenderMask; 127 127 _implicitBufferAttachmentResolveMask |= vs._implicitBufferAttachmentResolveMask; … … 160 160 _minimumNumberAccumBlueBits = 0; 161 161 _minimumNumberAccumAlphaBits = 0; 162 162 163 163 _maxNumOfGraphicsContexts = 32; 164 164 _numMultiSamples = 0; … … 168 168 _numMultiSamples = 4; 169 169 #endif 170 170 171 171 _compileContextsHint = false; 172 172 _serializeDrawDispatch = true; … … 292 292 { 293 293 const char* ptr = 0; 294 294 295 295 if ((ptr = getenv("OSG_DISPLAY_TYPE")) != 0) 296 296 { … … 315 315 } 316 316 } 317 317 318 318 if( (ptr = getenv("OSG_STEREO_MODE")) != 0) 319 319 { … … 420 420 } 421 421 } 422 422 423 423 if( (ptr = getenv("OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO")) != 0) 424 424 { … … 456 456 } 457 457 } 458 458 459 459 if( (ptr = getenv("OSG_SERIALIZE_DRAW_DISPATCH")) != 0) 460 460 { … … 624 624 _RGB = true; 625 625 _minimumNumberAlphaBits = 1; 626 } 626 } 627 627 628 628 while (arguments.read("--stencil")) … … 669 669 }; 670 670 671 int * mask[] = { 671 int * mask[] = { 672 672 &_implicitBufferAttachmentRenderMask, 673 673 &_implicitBufferAttachmentResolveMask,
