From a56b7e341d2fbdda8ec7d1419609ab67c0770db1 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 22 Mar 2014 20:22:05 -0700 Subject: [PATCH] reorganize files in interface directory --- interface/CMakeLists.txt | 2 +- interface/src/Application.cpp | 10 ++++++---- interface/src/Application.h | 10 +++++----- interface/src/Audio.h | 2 +- interface/src/Menu.cpp | 6 +++--- interface/src/VoxelImporter.h | 7 ++++--- .../{ => scripting}/ClipboardScriptingInterface.cpp | 0 .../src/{ => scripting}/ClipboardScriptingInterface.h | 0 .../{ => scripting}/ControllerScriptingInterface.cpp | 0 .../src/{ => scripting}/ControllerScriptingInterface.h | 0 .../src/{ => scripting}/MenuScriptingInterface.cpp | 0 interface/src/{ => scripting}/MenuScriptingInterface.h | 0 interface/src/{ => ui}/BandwidthMeter.cpp | 0 interface/src/{ => ui}/BandwidthMeter.h | 0 interface/src/{ => ui}/ImportDialog.cpp | 0 interface/src/{ => ui}/ImportDialog.h | 0 interface/src/{ => ui}/InfoView.cpp | 0 interface/src/{ => ui}/InfoView.h | 0 interface/src/{ => ui}/ModelBrowser.cpp | 0 interface/src/{ => ui}/ModelBrowser.h | 0 interface/src/{ => ui}/Oscilloscope.cpp | 0 interface/src/{ => ui}/Oscilloscope.h | 0 interface/src/ui/{ => overlays}/Base3DOverlay.cpp | 1 - interface/src/ui/{ => overlays}/Base3DOverlay.h | 0 interface/src/ui/{ => overlays}/Cube3DOverlay.cpp | 0 interface/src/ui/{ => overlays}/Cube3DOverlay.h | 0 interface/src/ui/{ => overlays}/ImageOverlay.cpp | 0 interface/src/ui/{ => overlays}/ImageOverlay.h | 0 interface/src/ui/{ => overlays}/Line3DOverlay.cpp | 0 interface/src/ui/{ => overlays}/Line3DOverlay.h | 0 interface/src/ui/{ => overlays}/LocalVoxelsOverlay.cpp | 0 interface/src/ui/{ => overlays}/LocalVoxelsOverlay.h | 0 interface/src/ui/{ => overlays}/Overlay.cpp | 0 interface/src/ui/{ => overlays}/Overlay.h | 0 interface/src/ui/{ => overlays}/Overlay2D.cpp | 0 interface/src/ui/{ => overlays}/Overlay2D.h | 0 interface/src/ui/{ => overlays}/Overlays.cpp | 0 interface/src/ui/{ => overlays}/Overlays.h | 0 interface/src/ui/{ => overlays}/Sphere3DOverlay.cpp | 0 interface/src/ui/{ => overlays}/Sphere3DOverlay.h | 0 interface/src/ui/{ => overlays}/TextOverlay.cpp | 2 +- interface/src/ui/{ => overlays}/TextOverlay.h | 0 interface/src/ui/{ => overlays}/Volume3DOverlay.cpp | 0 interface/src/ui/{ => overlays}/Volume3DOverlay.h | 0 44 files changed, 21 insertions(+), 19 deletions(-) rename interface/src/{ => scripting}/ClipboardScriptingInterface.cpp (100%) rename interface/src/{ => scripting}/ClipboardScriptingInterface.h (100%) rename interface/src/{ => scripting}/ControllerScriptingInterface.cpp (100%) rename interface/src/{ => scripting}/ControllerScriptingInterface.h (100%) rename interface/src/{ => scripting}/MenuScriptingInterface.cpp (100%) rename interface/src/{ => scripting}/MenuScriptingInterface.h (100%) rename interface/src/{ => ui}/BandwidthMeter.cpp (100%) rename interface/src/{ => ui}/BandwidthMeter.h (100%) rename interface/src/{ => ui}/ImportDialog.cpp (100%) rename interface/src/{ => ui}/ImportDialog.h (100%) rename interface/src/{ => ui}/InfoView.cpp (100%) rename interface/src/{ => ui}/InfoView.h (100%) rename interface/src/{ => ui}/ModelBrowser.cpp (100%) rename interface/src/{ => ui}/ModelBrowser.h (100%) rename interface/src/{ => ui}/Oscilloscope.cpp (100%) rename interface/src/{ => ui}/Oscilloscope.h (100%) rename interface/src/ui/{ => overlays}/Base3DOverlay.cpp (98%) rename interface/src/ui/{ => overlays}/Base3DOverlay.h (100%) rename interface/src/ui/{ => overlays}/Cube3DOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/Cube3DOverlay.h (100%) rename interface/src/ui/{ => overlays}/ImageOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/ImageOverlay.h (100%) rename interface/src/ui/{ => overlays}/Line3DOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/Line3DOverlay.h (100%) rename interface/src/ui/{ => overlays}/LocalVoxelsOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/LocalVoxelsOverlay.h (100%) rename interface/src/ui/{ => overlays}/Overlay.cpp (100%) rename interface/src/ui/{ => overlays}/Overlay.h (100%) rename interface/src/ui/{ => overlays}/Overlay2D.cpp (100%) rename interface/src/ui/{ => overlays}/Overlay2D.h (100%) rename interface/src/ui/{ => overlays}/Overlays.cpp (100%) rename interface/src/ui/{ => overlays}/Overlays.h (100%) rename interface/src/ui/{ => overlays}/Sphere3DOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/Sphere3DOverlay.h (100%) rename interface/src/ui/{ => overlays}/TextOverlay.cpp (98%) rename interface/src/ui/{ => overlays}/TextOverlay.h (100%) rename interface/src/ui/{ => overlays}/Volume3DOverlay.cpp (100%) rename interface/src/ui/{ => overlays}/Volume3DOverlay.h (100%) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 7126e8929f..3751c4c857 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -48,7 +48,7 @@ configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVe # grab the implementation and header files from src dirs file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) -foreach(SUBDIR avatar devices renderer ui starfield location) +foreach(SUBDIR avatar devices renderer ui starfield location scripting) file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h) set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}") endforeach(SUBDIR) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9563cbf3b4..91509386e4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -65,17 +65,19 @@ #include #include "Application.h" -#include "ClipboardScriptingInterface.h" #include "InterfaceVersion.h" #include "Menu.h" -#include "MenuScriptingInterface.h" #include "Util.h" #include "devices/OculusManager.h" #include "devices/TV3DManager.h" #include "renderer/ProgramObject.h" -#include "ui/TextRenderer.h" -#include "InfoView.h" + +#include "scripting/ClipboardScriptingInterface.h" +#include "scripting/MenuScriptingInterface.h" + +#include "ui/InfoView.h" #include "ui/Snapshot.h" +#include "ui/TextRenderer.h" using namespace std; diff --git a/interface/src/Application.h b/interface/src/Application.h index 28060113a9..38a8f87904 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -29,12 +29,12 @@ #include #include #include +#include +#include #include "Audio.h" -#include "BandwidthMeter.h" #include "BuckyBalls.h" #include "Camera.h" -#include "ControllerScriptingInterface.h" #include "DatagramProcessor.h" #include "Environment.h" #include "FileLogger.h" @@ -44,9 +44,7 @@ #include "PacketHeaders.h" #include "ParticleTreeRenderer.h" #include "Stars.h" -#include "ViewFrustum.h" #include "VoxelFade.h" -#include "VoxelEditPacketSender.h" #include "VoxelHideShowThread.h" #include "VoxelPacketProcessor.h" #include "VoxelSystem.h" @@ -63,13 +61,15 @@ #include "renderer/PointShader.h" #include "renderer/TextureCache.h" #include "renderer/VoxelShader.h" +#include "scripting/ControllerScriptingInterface.h" #include "ui/BandwidthDialog.h" +#include "ui/BandwidthMeter.h" #include "ui/OctreeStatsDialog.h" #include "ui/RearMirrorTools.h" #include "ui/LodToolsDialog.h" #include "ui/LogDialog.h" #include "ui/UpdateDialog.h" -#include "ui/Overlays.h" +#include "ui/overlays/Overlays.h" class QAction; diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 880391d7f3..6c2fbab204 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -27,7 +27,7 @@ #include #include -#include "Oscilloscope.h" +#include "ui/Oscilloscope.h" #include diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index e62c7e1102..e0ed6aa055 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -33,11 +33,11 @@ #include "Application.h" #include "Menu.h" -#include "MenuScriptingInterface.h" +#include "scripting/MenuScriptingInterface.h" #include "Util.h" -#include "InfoView.h" +#include "ui/InfoView.h" #include "ui/MetavoxelEditor.h" -#include "ModelBrowser.h" +#include "ui/ModelBrowser.h" Menu* Menu::_instance = NULL; diff --git a/interface/src/VoxelImporter.h b/interface/src/VoxelImporter.h index e77abaf18d..e3e5a1370c 100644 --- a/interface/src/VoxelImporter.h +++ b/interface/src/VoxelImporter.h @@ -9,12 +9,13 @@ #ifndef __hifi__VoxelImporter__ #define __hifi__VoxelImporter__ -#include -#include - #include #include +#include + +#include "ui/ImportDialog.h" + class ImportTask; class VoxelImporter : public QObject { diff --git a/interface/src/ClipboardScriptingInterface.cpp b/interface/src/scripting/ClipboardScriptingInterface.cpp similarity index 100% rename from interface/src/ClipboardScriptingInterface.cpp rename to interface/src/scripting/ClipboardScriptingInterface.cpp diff --git a/interface/src/ClipboardScriptingInterface.h b/interface/src/scripting/ClipboardScriptingInterface.h similarity index 100% rename from interface/src/ClipboardScriptingInterface.h rename to interface/src/scripting/ClipboardScriptingInterface.h diff --git a/interface/src/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp similarity index 100% rename from interface/src/ControllerScriptingInterface.cpp rename to interface/src/scripting/ControllerScriptingInterface.cpp diff --git a/interface/src/ControllerScriptingInterface.h b/interface/src/scripting/ControllerScriptingInterface.h similarity index 100% rename from interface/src/ControllerScriptingInterface.h rename to interface/src/scripting/ControllerScriptingInterface.h diff --git a/interface/src/MenuScriptingInterface.cpp b/interface/src/scripting/MenuScriptingInterface.cpp similarity index 100% rename from interface/src/MenuScriptingInterface.cpp rename to interface/src/scripting/MenuScriptingInterface.cpp diff --git a/interface/src/MenuScriptingInterface.h b/interface/src/scripting/MenuScriptingInterface.h similarity index 100% rename from interface/src/MenuScriptingInterface.h rename to interface/src/scripting/MenuScriptingInterface.h diff --git a/interface/src/BandwidthMeter.cpp b/interface/src/ui/BandwidthMeter.cpp similarity index 100% rename from interface/src/BandwidthMeter.cpp rename to interface/src/ui/BandwidthMeter.cpp diff --git a/interface/src/BandwidthMeter.h b/interface/src/ui/BandwidthMeter.h similarity index 100% rename from interface/src/BandwidthMeter.h rename to interface/src/ui/BandwidthMeter.h diff --git a/interface/src/ImportDialog.cpp b/interface/src/ui/ImportDialog.cpp similarity index 100% rename from interface/src/ImportDialog.cpp rename to interface/src/ui/ImportDialog.cpp diff --git a/interface/src/ImportDialog.h b/interface/src/ui/ImportDialog.h similarity index 100% rename from interface/src/ImportDialog.h rename to interface/src/ui/ImportDialog.h diff --git a/interface/src/InfoView.cpp b/interface/src/ui/InfoView.cpp similarity index 100% rename from interface/src/InfoView.cpp rename to interface/src/ui/InfoView.cpp diff --git a/interface/src/InfoView.h b/interface/src/ui/InfoView.h similarity index 100% rename from interface/src/InfoView.h rename to interface/src/ui/InfoView.h diff --git a/interface/src/ModelBrowser.cpp b/interface/src/ui/ModelBrowser.cpp similarity index 100% rename from interface/src/ModelBrowser.cpp rename to interface/src/ui/ModelBrowser.cpp diff --git a/interface/src/ModelBrowser.h b/interface/src/ui/ModelBrowser.h similarity index 100% rename from interface/src/ModelBrowser.h rename to interface/src/ui/ModelBrowser.h diff --git a/interface/src/Oscilloscope.cpp b/interface/src/ui/Oscilloscope.cpp similarity index 100% rename from interface/src/Oscilloscope.cpp rename to interface/src/ui/Oscilloscope.cpp diff --git a/interface/src/Oscilloscope.h b/interface/src/ui/Oscilloscope.h similarity index 100% rename from interface/src/Oscilloscope.h rename to interface/src/ui/Oscilloscope.h diff --git a/interface/src/ui/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp similarity index 98% rename from interface/src/ui/Base3DOverlay.cpp rename to interface/src/ui/overlays/Base3DOverlay.cpp index 67e7ea25f2..bcd2ca1cd2 100644 --- a/interface/src/ui/Base3DOverlay.cpp +++ b/interface/src/ui/overlays/Base3DOverlay.cpp @@ -12,7 +12,6 @@ #include #include "Base3DOverlay.h" -#include "TextRenderer.h" const glm::vec3 DEFAULT_POSITION = glm::vec3(0.0f, 0.0f, 0.0f); const float DEFAULT_LINE_WIDTH = 1.0f; diff --git a/interface/src/ui/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h similarity index 100% rename from interface/src/ui/Base3DOverlay.h rename to interface/src/ui/overlays/Base3DOverlay.h diff --git a/interface/src/ui/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp similarity index 100% rename from interface/src/ui/Cube3DOverlay.cpp rename to interface/src/ui/overlays/Cube3DOverlay.cpp diff --git a/interface/src/ui/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h similarity index 100% rename from interface/src/ui/Cube3DOverlay.h rename to interface/src/ui/overlays/Cube3DOverlay.h diff --git a/interface/src/ui/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp similarity index 100% rename from interface/src/ui/ImageOverlay.cpp rename to interface/src/ui/overlays/ImageOverlay.cpp diff --git a/interface/src/ui/ImageOverlay.h b/interface/src/ui/overlays/ImageOverlay.h similarity index 100% rename from interface/src/ui/ImageOverlay.h rename to interface/src/ui/overlays/ImageOverlay.h diff --git a/interface/src/ui/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp similarity index 100% rename from interface/src/ui/Line3DOverlay.cpp rename to interface/src/ui/overlays/Line3DOverlay.cpp diff --git a/interface/src/ui/Line3DOverlay.h b/interface/src/ui/overlays/Line3DOverlay.h similarity index 100% rename from interface/src/ui/Line3DOverlay.h rename to interface/src/ui/overlays/Line3DOverlay.h diff --git a/interface/src/ui/LocalVoxelsOverlay.cpp b/interface/src/ui/overlays/LocalVoxelsOverlay.cpp similarity index 100% rename from interface/src/ui/LocalVoxelsOverlay.cpp rename to interface/src/ui/overlays/LocalVoxelsOverlay.cpp diff --git a/interface/src/ui/LocalVoxelsOverlay.h b/interface/src/ui/overlays/LocalVoxelsOverlay.h similarity index 100% rename from interface/src/ui/LocalVoxelsOverlay.h rename to interface/src/ui/overlays/LocalVoxelsOverlay.h diff --git a/interface/src/ui/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp similarity index 100% rename from interface/src/ui/Overlay.cpp rename to interface/src/ui/overlays/Overlay.cpp diff --git a/interface/src/ui/Overlay.h b/interface/src/ui/overlays/Overlay.h similarity index 100% rename from interface/src/ui/Overlay.h rename to interface/src/ui/overlays/Overlay.h diff --git a/interface/src/ui/Overlay2D.cpp b/interface/src/ui/overlays/Overlay2D.cpp similarity index 100% rename from interface/src/ui/Overlay2D.cpp rename to interface/src/ui/overlays/Overlay2D.cpp diff --git a/interface/src/ui/Overlay2D.h b/interface/src/ui/overlays/Overlay2D.h similarity index 100% rename from interface/src/ui/Overlay2D.h rename to interface/src/ui/overlays/Overlay2D.h diff --git a/interface/src/ui/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp similarity index 100% rename from interface/src/ui/Overlays.cpp rename to interface/src/ui/overlays/Overlays.cpp diff --git a/interface/src/ui/Overlays.h b/interface/src/ui/overlays/Overlays.h similarity index 100% rename from interface/src/ui/Overlays.h rename to interface/src/ui/overlays/Overlays.h diff --git a/interface/src/ui/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp similarity index 100% rename from interface/src/ui/Sphere3DOverlay.cpp rename to interface/src/ui/overlays/Sphere3DOverlay.cpp diff --git a/interface/src/ui/Sphere3DOverlay.h b/interface/src/ui/overlays/Sphere3DOverlay.h similarity index 100% rename from interface/src/ui/Sphere3DOverlay.h rename to interface/src/ui/overlays/Sphere3DOverlay.h diff --git a/interface/src/ui/TextOverlay.cpp b/interface/src/ui/overlays/TextOverlay.cpp similarity index 98% rename from interface/src/ui/TextOverlay.cpp rename to interface/src/ui/overlays/TextOverlay.cpp index edaec6849a..1a6edb3ea2 100644 --- a/interface/src/ui/TextOverlay.cpp +++ b/interface/src/ui/overlays/TextOverlay.cpp @@ -12,7 +12,7 @@ #include #include "TextOverlay.h" -#include "TextRenderer.h" +#include "ui/TextRenderer.h" TextOverlay::TextOverlay() : _leftMargin(DEFAULT_MARGIN), diff --git a/interface/src/ui/TextOverlay.h b/interface/src/ui/overlays/TextOverlay.h similarity index 100% rename from interface/src/ui/TextOverlay.h rename to interface/src/ui/overlays/TextOverlay.h diff --git a/interface/src/ui/Volume3DOverlay.cpp b/interface/src/ui/overlays/Volume3DOverlay.cpp similarity index 100% rename from interface/src/ui/Volume3DOverlay.cpp rename to interface/src/ui/overlays/Volume3DOverlay.cpp diff --git a/interface/src/ui/Volume3DOverlay.h b/interface/src/ui/overlays/Volume3DOverlay.h similarity index 100% rename from interface/src/ui/Volume3DOverlay.h rename to interface/src/ui/overlays/Volume3DOverlay.h