Move simgear/sky/ to simgear/scene/sky as part of the consolodation of

graphics code.

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 26633176f45f170eda525fbeb35437f70a3a9f7e..0a6cce5cbb77ec7ca0cf342b22dcc8300b3de2d9 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -21,7 +21,7 @@
 // $Id$
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/sky/sky.hxx>
+#include <simgear/scene/sky/sky.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 32a6ed112b83bcd06d7eab3d02bef4d3dbb8614e..17bdd49c8a7c072ae53861178a7a79d2eca2b5d5 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -83,10 +83,10 @@ SG_USING_STD(endl);
 #include <simgear/scene/model/model.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #ifdef FG_USE_CLOUDS_3D
-#  include <simgear/sky/clouds3d/SkySceneLoader.hpp>
-#  include <simgear/sky/clouds3d/SkyUtil.hpp>
+#  include <simgear/scene/sky/clouds3d/SkySceneLoader.hpp>
+#  include <simgear/scene/sky/clouds3d/SkyUtil.hpp>
 #endif
-#include <simgear/sky/sky.hxx>
+#include <simgear/scene/sky/sky.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include <Include/general.hxx>
@@ -97,7 +97,6 @@ SG_USING_STD(endl);
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/AIMgr.hxx>
 
-
 #include <Autopilot/newauto.hxx>
 
 #include <Cockpit/hud.hxx>

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 190b806178c42b31a993c00b6be720d9650348a8..b63b64929ce11f8c02cc40cc066d2a2ecd8c98fb 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -52,8 +52,8 @@ SG_USING_STD(string);
 #include <simgear/math/interpolater.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/sky/sky.hxx>
 #include <simgear/screen/colors.hxx>
-#include <simgear/sky/sky.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/viewer.hxx>