Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 01:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More header cleanup

Browse source
This commit is contained in:
Atlante45 2015-09-24 21:53:57 +02:00
parent f55f146d1b
commit 34bba28775
5 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -111,12 +111,16 @@
#include "LODManager.h" #include "LODManager.h"
#include "Menu.h" #include "Menu.h"
#include "ModelPackager.h" #include "ModelPackager.h"
#include "Stars.h"
#include "Util.h" #include "Util.h"
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "InterfaceActionFactory.h" #include "InterfaceActionFactory.h"
#include "PluginContainerProxy.h"
#include "AnimDebugDraw.h"
#include "avatar/AvatarManager.h" #include "avatar/AvatarManager.h"
#include "audio/AudioScope.h" #include "audio/AudioScope.h"
#include "devices/DdeFaceTracker.h" #include "devices/DdeFaceTracker.h"
#include "devices/EyeTracker.h" #include "devices/EyeTracker.h"
#include "devices/Faceshift.h" #include "devices/Faceshift.h"
@ -152,9 +156,6 @@
#include "ui/UpdateDialog.h" #include "ui/UpdateDialog.h"
#include "ui/overlays/Cube3DOverlay.h" #include "ui/overlays/Cube3DOverlay.h"
#include "PluginContainerProxy.h"
#include "AnimDebugDraw.h"
// ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU // ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
// FIXME seems to be broken. // FIXME seems to be broken.
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)

24
interface/src/Application.h
View file

@ -37,31 +37,27 @@
#include <ViewFrustum.h> #include <ViewFrustum.h>
#include <SimpleMovingAverage.h> #include <SimpleMovingAverage.h>
#include "AudioClient.h"
#include "Bookmarks.h" #include "Bookmarks.h"
#include "Camera.h" #include "Camera.h"
#include "Environment.h" #include "Environment.h"
#include "FileLogger.h" #include "FileLogger.h"
#include "Menu.h" #include "Menu.h"
#include "Physics.h" #include "Physics.h"
#include "Stars.h"
#include "avatar/AvatarUpdate.h" #include "avatar/AvatarUpdate.h"
#include "avatar/Avatar.h"
#include "avatar/MyAvatar.h" #include "avatar/MyAvatar.h"
#include "scripting/ControllerScriptingInterface.h" #include "scripting/ControllerScriptingInterface.h"
#include "scripting/DialogsManagerScriptingInterface.h" #include "scripting/DialogsManagerScriptingInterface.h"
#include "scripting/WebWindowClass.h"
#include "ui/AudioStatsDialog.h"
#include "ui/BandwidthDialog.h"
#include "ui/ModelsBrowser.h"
#include "ui/OctreeStatsDialog.h"
#include "ui/SnapshotShareDialog.h" #include "ui/SnapshotShareDialog.h"
#include "ui/LodToolsDialog.h"
#include "ui/LogDialog.h"
#include "ui/overlays/Overlays.h"
#include "ui/ApplicationOverlay.h" #include "ui/ApplicationOverlay.h"
#include "ui/ApplicationCompositor.h" #include "ui/ApplicationCompositor.h"
#include "ui/AudioStatsDialog.h"
#include "ui/BandwidthDialog.h"
#include "ui/LodToolsDialog.h"
#include "ui/LogDialog.h"
#include "ui/OctreeStatsDialog.h"
#include "ui/OverlayConductor.h" #include "ui/OverlayConductor.h"
#include "ui/overlays/Overlays.h"
#include "ui/RunningScriptsWidget.h" #include "ui/RunningScriptsWidget.h"
#include "ui/ToolWindow.h" #include "ui/ToolWindow.h"
#include "octree/OctreePacketProcessor.h" #include "octree/OctreePacketProcessor.h"
@ -72,16 +68,10 @@
#include "render/Engine.h" #include "render/Engine.h"
class OffscreenGlCanvas; class OffscreenGlCanvas;
class GLCanvas; class GLCanvas;
class FaceTracker; class FaceTracker;
class MainWindow; class MainWindow;
namespace gpu {
class Context;
typedef std::shared_ptr<Context> ContextPointer;
}
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
static const UINT UWM_IDENTIFY_INSTANCES = static const UINT UWM_IDENTIFY_INSTANCES =
RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME")); RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME"));

2
interface/src/avatar/MyAvatar.cpp
View file

@ -25,6 +25,7 @@
#include <AudioClient.h> #include <AudioClient.h>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <display-plugins/DisplayPlugin.h> #include <display-plugins/DisplayPlugin.h>
#include <FSTReader.h>
#include <GeometryUtil.h> #include <GeometryUtil.h>
#include <NodeList.h> #include <NodeList.h>
#include <udt/PacketHeaders.h> #include <udt/PacketHeaders.h>
@ -37,6 +38,7 @@
#include "devices/Faceshift.h" #include "devices/Faceshift.h"
#include "Application.h" #include "Application.h"
#include "AvatarManager.h" #include "AvatarManager.h"
#include "Environment.h" #include "Environment.h"

5
interface/src/ui/AvatarInputs.cpp
View file

@ -7,13 +7,14 @@
// //
#include "Application.h"
#include "AvatarInputs.h" #include "AvatarInputs.h"
#include <AudioClient.h>
#include <SettingHandle.h> #include <SettingHandle.h>
#include "Menu.h" #include "Application.h"
#include "devices/FaceTracker.h" #include "devices/FaceTracker.h"
#include "Menu.h"
HIFI_QML_DEF(AvatarInputs) HIFI_QML_DEF(AvatarInputs)

5
interface/src/ui/ScriptEditBox.cpp
View file

@ -10,8 +10,11 @@
// //
#include "ScriptEditBox.h" #include "ScriptEditBox.h"
#include <QPainter>
#include <QTextBlock>
#include "ScriptLineNumberArea.h" #include "ScriptLineNumberArea.h"
#include "Application.h"
ScriptEditBox::ScriptEditBox(QWidget* parent) : ScriptEditBox::ScriptEditBox(QWidget* parent) :
QPlainTextEdit(parent) QPlainTextEdit(parent)