fly/flightgear
1
0
Fork 0
Code Activity

CameraGroup: adapt order of member vars to their init sequence.

Browse source 
(Avoids flood of "init sequence" GCC warnings, whenever CameraGroup.hxx
is included anywhere)
This commit is contained in:
ThorstenB 2012-03-26 21:21:41 +02:00
parent d436484c21
commit 834d4e1e3e
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Main/CameraGroup.hxx
View file

@ -123,6 +123,25 @@ struct CameraInfo : public osg::Referenced
/** Properties of the camera. @see CameraGroup::Flags. /** Properties of the camera. @see CameraGroup::Flags.
*/ */
unsigned flags; unsigned flags;
/** Viewport parameters.
*/
double x;
double y;
double width;
double height;
/** Physical size parameters.
*/
double physicalWidth;
double physicalHeight;
double bezelHeightTop;
double bezelHeightBottom;
double bezelWidthLeft;
double bezelWidthRight;
/** The parent camera for relative camera configurations.
*/
unsigned relativeCameraParent;
/** the camera objects /** the camera objects
*/ */
CameraMap cameras; CameraMap cameras;
@ -142,31 +161,13 @@ struct CameraInfo : public osg::Referenced
//osg::ref_ptr<osg::Uniform> bloomOffset[2]; //osg::ref_ptr<osg::Uniform> bloomOffset[2];
osg::ref_ptr<osg::Uniform> projInverse; osg::ref_ptr<osg::Uniform> projInverse;
osg::ref_ptr<osg::Uniform> viewInverse; osg::ref_ptr<osg::Uniform> viewInverse;
osg::ref_ptr<osg::Uniform> view;
osg::ref_ptr<osg::Uniform> du; osg::ref_ptr<osg::Uniform> du;
osg::ref_ptr<osg::Uniform> dv; osg::ref_ptr<osg::Uniform> dv;
osg::ref_ptr<osg::Uniform> view;
void setMatrices( osg::Camera* c ); void setMatrices( osg::Camera* c );
osgUtil::RenderBin::RenderBinList savedTransparentBins; osgUtil::RenderBin::RenderBinList savedTransparentBins;
/** Viewport parameters.
*/
double x;
double y;
double width;
double height;
/** Physical size parameters.
*/
double physicalWidth;
double physicalHeight;
double bezelHeightTop;
double bezelHeightBottom;
double bezelWidthLeft;
double bezelWidthRight;
/** The parent camera for relative camera configurations.
*/
unsigned relativeCameraParent;
/** The reference points in the parents projection space. /** The reference points in the parents projection space.
*/ */
osg::Vec2d parentReference[2]; osg::Vec2d parentReference[2];