Moved device-related files to "devices" folder.

interface/src/Application.cpp

@@ -58,13 +58,13 @@
 
 #include "Application.h"
 #include "LogDisplay.h"
-#include "LeapManager.h"
 #include "Menu.h"
-#include "OculusManager.h"
+#include "Swatch.h"
 #include "Util.h"
+#include "devices/LeapManager.h"
+#include "devices/OculusManager.h"
 #include "renderer/ProgramObject.h"
 #include "ui/TextRenderer.h"
-#include "Swatch.h"
 
 using namespace std;
 

interface/src/Application.h

@@ -33,7 +33,6 @@
 #include "GLCanvas.h"
 #include "PacketHeaders.h"
 #include "PieMenu.h"
-#include "SerialInterface.h"
 #include "Stars.h"
 #include "Swatch.h"
 #include "ToolsPalette.h"
@@ -43,11 +42,12 @@
 #include "VoxelPacketProcessor.h"
 #include "VoxelSystem.h"
 #include "VoxelImporter.h"
-#include "Webcam.h"
 #include "avatar/Avatar.h"
 #include "avatar/MyAvatar.h"
 #include "avatar/HandControl.h"
 #include "devices/Faceshift.h"
+#include "devices/SerialInterface.h"
+#include "devices/Webcam.h"
 #include "renderer/AmbientOcclusionEffect.h"
 #include "renderer/GeometryCache.h"
 #include "renderer/GlowEffect.h"

interface/src/avatar/Avatar.cpp

@@ -13,7 +13,6 @@
 
 #include <NodeList.h>
 #include <NodeTypes.h>
-#include <OculusManager.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
 
@@ -23,6 +22,7 @@
 #include "Head.h"
 #include "Physics.h"
 #include "world.h"
+#include "devices/OculusManager.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;

interface/src/avatar/Avatar.h

@@ -22,10 +22,9 @@
 #include "Head.h"
 #include "InterfaceConfig.h"
 #include "Skeleton.h"
-#include "SerialInterface.h"
-#include "Transmitter.h"
 #include "world.h"
-
+#include "devices/SerialInterface.h"
+#include "devices/Transmitter.h"
 
 static const float MAX_SCALE = 1000.f;
 static const float MIN_SCALE = .005f;

interface/src/avatar/Face.cpp

@@ -17,7 +17,6 @@
 #include "Avatar.h"
 #include "Head.h"
 #include "Face.h"
-#include "Webcam.h"
 #include "renderer/ProgramObject.h"
 
 using namespace cv;

interface/src/avatar/Hand.h

@@ -8,17 +8,22 @@
 #ifndef hifi_Hand_h
 #define hifi_Hand_h
 
+#include <vector>
+
 #include <QAction>
+
 #include <glm/glm.hpp>
+
+#include <SharedUtil.h>
+
 #include <AvatarData.h>
 #include <HandData.h>
+
 #include "Balls.h"
-#include "world.h"
 #include "InterfaceConfig.h"
-#include "SerialInterface.h"
 #include "ParticleSystem.h"
-#include <SharedUtil.h>
-#include <vector>
+#include "world.h"
+#include "devices/SerialInterface.h"
 
 enum RaveLightsSetting {
     RAVE_LIGHTS_AVATAR = 0,

interface/src/avatar/Head.h

@@ -17,11 +17,11 @@
 
 #include <VoxelConstants.h>
 
-#include "Face.h"
 #include "BendyLine.h"
+#include "Face.h"
 #include "InterfaceConfig.h"
-#include "SerialInterface.h"
 #include "world.h"
+#include "devices/SerialInterface.h"
 
 enum eyeContactTargets {
     LEFT_EYE, 

interface/src/avatar/MyAvatar.cpp

@@ -6,20 +6,19 @@
 //  Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
 //
 
-#include "MyAvatar.h"
-
 #include <vector>
 
 #include <glm/gtx/vector_angle.hpp>
 
 #include <NodeList.h>
 #include <NodeTypes.h>
-#include <OculusManager.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
 
 #include "Application.h"
+#include "MyAvatar.h"
 #include "Physics.h"
+#include "devices/OculusManager.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;