From 0a9db6a5eea72851e953458e658855520f2ace25 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 4 Sep 2013 12:15:36 -0700 Subject: [PATCH] Moved device-related files to "devices" folder. --- interface/src/Application.cpp | 6 +++--- interface/src/Application.h | 4 ++-- interface/src/avatar/Avatar.cpp | 2 +- interface/src/avatar/Avatar.h | 5 ++--- interface/src/avatar/Face.cpp | 1 - interface/src/avatar/Hand.h | 13 +++++++++---- interface/src/avatar/Head.h | 4 ++-- interface/src/avatar/MyAvatar.cpp | 5 ++--- interface/src/{ => devices}/LeapManager.cpp | 0 interface/src/{ => devices}/LeapManager.h | 0 interface/src/{ => devices}/OculusManager.cpp | 0 interface/src/{ => devices}/OculusManager.h | 0 interface/src/{ => devices}/SerialInterface.cpp | 0 interface/src/{ => devices}/SerialInterface.h | 0 interface/src/{ => devices}/Transmitter.cpp | 0 interface/src/{ => devices}/Transmitter.h | 0 interface/src/{ => devices}/Webcam.cpp | 0 interface/src/{ => devices}/Webcam.h | 0 18 files changed, 21 insertions(+), 19 deletions(-) rename interface/src/{ => devices}/LeapManager.cpp (100%) rename interface/src/{ => devices}/LeapManager.h (100%) rename interface/src/{ => devices}/OculusManager.cpp (100%) rename interface/src/{ => devices}/OculusManager.h (100%) rename interface/src/{ => devices}/SerialInterface.cpp (100%) rename interface/src/{ => devices}/SerialInterface.h (100%) rename interface/src/{ => devices}/Transmitter.cpp (100%) rename interface/src/{ => devices}/Transmitter.h (100%) rename interface/src/{ => devices}/Webcam.cpp (100%) rename interface/src/{ => devices}/Webcam.h (100%) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a50663b316..be26fb04ef 100644 --- a/interface/src/Application.cpp +++ b/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; diff --git a/interface/src/Application.h b/interface/src/Application.h index 01d2104438..2d88bca73c 100644 --- a/interface/src/Application.h +++ b/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" diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 8b6eea4ee4..084b1f8c85 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -23,6 +22,7 @@ #include "Head.h" #include "Physics.h" #include "world.h" +#include "devices/OculusManager.h" #include "ui/TextRenderer.h" using namespace std; diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index b04f9f04b8..3aee9599d2 100755 --- a/interface/src/avatar/Avatar.h +++ b/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; diff --git a/interface/src/avatar/Face.cpp b/interface/src/avatar/Face.cpp index 5bcfba2334..47a37d6973 100644 --- a/interface/src/avatar/Face.cpp +++ b/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; diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index c4bc428456..145ec67c15 100755 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -8,17 +8,22 @@ #ifndef hifi_Hand_h #define hifi_Hand_h +#include + #include + #include + +#include + #include #include + #include "Balls.h" -#include "world.h" #include "InterfaceConfig.h" -#include "SerialInterface.h" #include "ParticleSystem.h" -#include -#include +#include "world.h" +#include "devices/SerialInterface.h" enum RaveLightsSetting { RAVE_LIGHTS_AVATAR = 0, diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h index c6fcac0bd7..a1075f3ba2 100644 --- a/interface/src/avatar/Head.h +++ b/interface/src/avatar/Head.h @@ -17,11 +17,11 @@ #include -#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, diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 79dedc45b1..4b7f64cb6f 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -6,20 +6,19 @@ // Copyright (c) 2012 High Fidelity, Inc. All rights reserved. // -#include "MyAvatar.h" - #include #include #include #include -#include #include #include #include "Application.h" +#include "MyAvatar.h" #include "Physics.h" +#include "devices/OculusManager.h" #include "ui/TextRenderer.h" using namespace std; diff --git a/interface/src/LeapManager.cpp b/interface/src/devices/LeapManager.cpp similarity index 100% rename from interface/src/LeapManager.cpp rename to interface/src/devices/LeapManager.cpp diff --git a/interface/src/LeapManager.h b/interface/src/devices/LeapManager.h similarity index 100% rename from interface/src/LeapManager.h rename to interface/src/devices/LeapManager.h diff --git a/interface/src/OculusManager.cpp b/interface/src/devices/OculusManager.cpp similarity index 100% rename from interface/src/OculusManager.cpp rename to interface/src/devices/OculusManager.cpp diff --git a/interface/src/OculusManager.h b/interface/src/devices/OculusManager.h similarity index 100% rename from interface/src/OculusManager.h rename to interface/src/devices/OculusManager.h diff --git a/interface/src/SerialInterface.cpp b/interface/src/devices/SerialInterface.cpp similarity index 100% rename from interface/src/SerialInterface.cpp rename to interface/src/devices/SerialInterface.cpp diff --git a/interface/src/SerialInterface.h b/interface/src/devices/SerialInterface.h similarity index 100% rename from interface/src/SerialInterface.h rename to interface/src/devices/SerialInterface.h diff --git a/interface/src/Transmitter.cpp b/interface/src/devices/Transmitter.cpp similarity index 100% rename from interface/src/Transmitter.cpp rename to interface/src/devices/Transmitter.cpp diff --git a/interface/src/Transmitter.h b/interface/src/devices/Transmitter.h similarity index 100% rename from interface/src/Transmitter.h rename to interface/src/devices/Transmitter.h diff --git a/interface/src/Webcam.cpp b/interface/src/devices/Webcam.cpp similarity index 100% rename from interface/src/Webcam.cpp rename to interface/src/devices/Webcam.cpp diff --git a/interface/src/Webcam.h b/interface/src/devices/Webcam.h similarity index 100% rename from interface/src/Webcam.h rename to interface/src/devices/Webcam.h