forward declare Point3D in sg_types.hxx

This avoids sucking in SGMath.hxx -- and therefore a bunch of OSG headers --
into many compilation units.

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index 7fd5eb477b14f11d72207584527c081f8b12a66f..be77d5864252149e7bfd52a11e21831c89e4020c 100644 (file)
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -33,6 +33,7 @@
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/math/sg_types.hxx>
+#include <simgear/math/point3d.hxx>
 #include <simgear/bucket/newbucket.hxx>
 
 #include <stdio.h>

diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index 4698acecb5886d8018ced33e24a9136e87a49617..f413c26b58359eb66f13f00c6773132562e2bffd 100644 (file)
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -38,7 +38,7 @@
 #include <string>
 #include <vector>
 
-#include <simgear/math/point3d.hxx>
+class Point3D;
 
 using std::vector;
 using std::string;

diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index 2705980d1c96db73cc04ed30c65878f49aface37..30af6eff8e7b34b35cd53101f48ca554ad818b09 100644 (file)
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -149,6 +149,7 @@ enter this in the official comments in case I forget again. :-)
 
 #include "texcoord.hxx"
 
+#include <simgear/math/point3d.hxx>
 // using std::cout;
 // using std::endl;
 

diff --git a/simgear/scene/sky/oursun.cxx b/simgear/scene/sky/oursun.cxx
index e4249989ee6305c38b96f137e3f61ed15820abb7..db7e73198cb69c8cf47c7ed0d738fed41cdfe8f4 100644 (file)
--- a/simgear/scene/sky/oursun.cxx
+++ b/simgear/scene/sky/oursun.cxx
@@ -41,6 +41,7 @@
 #include <osg/Texture2D>
 #include <osgDB/ReadFile>
 
+#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/PathOptions.hxx>
 #include <simgear/screen/colors.hxx>
 #include <simgear/scene/model/model.hxx>

diff --git a/simgear/scene/tgdb/SGLightBin.hxx b/simgear/scene/tgdb/SGLightBin.hxx
index 09df31e3409356f36979c34d1aa108c917becdb3..c6cb6f25c347fbd4cfeb41fda47d380198734abe 100644 (file)
--- a/simgear/scene/tgdb/SGLightBin.hxx
+++ b/simgear/scene/tgdb/SGLightBin.hxx
@@ -22,6 +22,8 @@
 #ifndef SG_LIGHT_BIN_HXX
 #define SG_LIGHT_BIN_HXX
 
+#include <simgear/math/SGMath.hxx>
+
 class SGLightBin {
 public:
   struct Light {