From ea98581d22c20cbba734941fc69b0477afed39e8 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 17 Jun 2015 09:18:00 -0700
Subject: [PATCH] reorganize files to cleanup headers

---
 libraries/model/CMakeLists.txt                      |  3 ++-
 .../render-utils}/src/Environment.cpp               | 13 +++++--------
 .../render-utils}/src/Environment.h                 |  0
 .../src}/SkyFromAtmosphere.slf                      |  0
 .../src}/SkyFromAtmosphere.slv                      |  0
 .../src/model => render-utils/src}/SkyFromSpace.slf |  0
 .../src/model => render-utils/src}/SkyFromSpace.slv |  0
 7 files changed, 7 insertions(+), 9 deletions(-)
 rename {interface => libraries/render-utils}/src/Environment.cpp (97%)
 rename {interface => libraries/render-utils}/src/Environment.h (100%)
 rename libraries/{model/src/model => render-utils/src}/SkyFromAtmosphere.slf (100%)
 rename libraries/{model/src/model => render-utils/src}/SkyFromAtmosphere.slv (100%)
 rename libraries/{model/src/model => render-utils/src}/SkyFromSpace.slf (100%)
 rename libraries/{model/src/model => render-utils/src}/SkyFromSpace.slv (100%)

diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt
index 278c40c435..7456716946 100755
--- a/libraries/model/CMakeLists.txt
+++ b/libraries/model/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(TARGET_NAME model)
-
+
+
 AUTOSCRIBE_SHADER_LIB(gpu)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
diff --git a/interface/src/Environment.cpp b/libraries/render-utils/src/Environment.cpp
similarity index 97%
rename from interface/src/Environment.cpp
rename to libraries/render-utils/src/Environment.cpp
index 09dd8f792e..411beca0ae 100644
--- a/interface/src/Environment.cpp
+++ b/libraries/render-utils/src/Environment.cpp
@@ -9,27 +9,24 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "InterfaceConfig.h"
-
 #include <QByteArray>
 #include <QMutexLocker>
 #include <QtDebug>
 
-#include <GeometryCache.h>
+#include "GeometryCache.h"
 #include <GeometryUtil.h>
 #include <NumericalConstants.h>
 #include <OctreePacketData.h>
 #include <PacketHeaders.h>
 #include <PathUtils.h>
-#include <ProgramObject.h>
 #include <SharedUtil.h>
 
 #include "Environment.h"
 
-#include "../../build/libraries/model/SkyFromSpace_vert.h"
-#include "../../build/libraries/model/SkyFromSpace_frag.h"
-#include "../../build/libraries/model/SkyFromAtmosphere_vert.h"
-#include "../../build/libraries/model/SkyFromAtmosphere_frag.h"
+#include "SkyFromSpace_vert.h"
+#include "SkyFromSpace_frag.h"
+#include "SkyFromAtmosphere_vert.h"
+#include "SkyFromAtmosphere_frag.h"
 
 uint qHash(const HifiSockAddr& sockAddr) {
     if (sockAddr.getAddress().isNull()) {
diff --git a/interface/src/Environment.h b/libraries/render-utils/src/Environment.h
similarity index 100%
rename from interface/src/Environment.h
rename to libraries/render-utils/src/Environment.h
diff --git a/libraries/model/src/model/SkyFromAtmosphere.slf b/libraries/render-utils/src/SkyFromAtmosphere.slf
similarity index 100%
rename from libraries/model/src/model/SkyFromAtmosphere.slf
rename to libraries/render-utils/src/SkyFromAtmosphere.slf
diff --git a/libraries/model/src/model/SkyFromAtmosphere.slv b/libraries/render-utils/src/SkyFromAtmosphere.slv
similarity index 100%
rename from libraries/model/src/model/SkyFromAtmosphere.slv
rename to libraries/render-utils/src/SkyFromAtmosphere.slv
diff --git a/libraries/model/src/model/SkyFromSpace.slf b/libraries/render-utils/src/SkyFromSpace.slf
similarity index 100%
rename from libraries/model/src/model/SkyFromSpace.slf
rename to libraries/render-utils/src/SkyFromSpace.slf
diff --git a/libraries/model/src/model/SkyFromSpace.slv b/libraries/render-utils/src/SkyFromSpace.slv
similarity index 100%
rename from libraries/model/src/model/SkyFromSpace.slv
rename to libraries/render-utils/src/SkyFromSpace.slv