From: ThorstenB <brehmt@gmail.com>
Date: Mon, 26 Mar 2012 19:21:41 +0000 (+0200)
Subject: CameraGroup: adapt order of member vars to their init sequence.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=834d4e1e3ec137cf54143829b6f5bb47e094f3f9;p=flightgear.git

CameraGroup: adapt order of member vars to their init sequence.
(Avoids flood of "init sequence" GCC warnings, whenever CameraGroup.hxx
is included anywhere)
---

diff --git a/src/Main/CameraGroup.hxx b/src/Main/CameraGroup.hxx
index 75ff12ac5..17c0ad003 100644
--- a/src/Main/CameraGroup.hxx
+++ b/src/Main/CameraGroup.hxx
@@ -123,6 +123,25 @@ struct CameraInfo : public osg::Referenced
     /** Properties of the camera. @see CameraGroup::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
      */
 	CameraMap cameras;
@@ -142,31 +161,13 @@ struct CameraInfo : public osg::Referenced
     //osg::ref_ptr<osg::Uniform> bloomOffset[2];
     osg::ref_ptr<osg::Uniform> projInverse;
     osg::ref_ptr<osg::Uniform> viewInverse;
+    osg::ref_ptr<osg::Uniform> view;
     osg::ref_ptr<osg::Uniform> du;
     osg::ref_ptr<osg::Uniform> dv;
-    osg::ref_ptr<osg::Uniform> view;
 
 	void setMatrices( osg::Camera* c );
 
 	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.
      */
     osg::Vec2d parentReference[2];