Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 21:42:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update includes for moved files

Browse source
This commit is contained in:
Atlante45 2015-07-13 15:28:55 -07:00
parent 4a22f18add
commit c80df94b06
58 changed files with 60 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/Agent.cpp
View file

@ -19,7 +19,7 @@
#include <AvatarHashMap.h>
#include <NetworkAccessManager.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <ResourceCache.h>
#include <SoundCache.h>
#include <UUID.h>

2
assignment-client/src/AssignmentClient.cpp
View file

@ -26,7 +26,7 @@
#include <LogUtils.h>
#include <LimitedNodeList.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <ShutdownEventListener.h>
#include <SoundCache.h>

2
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -18,7 +18,7 @@
#include "AssignmentClientMonitor.h"
#include "AssignmentClientApp.h"
#include "AssignmentClientChildData.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "SharedUtil.h"

2
assignment-client/src/AssignmentFactory.cpp
View file

@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "Agent.h"
#include "AssignmentFactory.h"

2
assignment-client/src/audio/AudioMixer.cpp
View file

@ -45,7 +45,7 @@
#include <NodeList.h>
#include <Node.h>
#include <OctreeConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <StDev.h>
#include <UUID.h>

2
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -12,7 +12,7 @@
#include <QtCore/QDebug>
#include <QtCore/QJsonArray>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <UUID.h>
#include "InjectedAudioStream.h"

2
assignment-client/src/audio/AvatarAudioStream.cpp
View file

@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "AvatarAudioStream.h"

2
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -20,7 +20,7 @@
#include <LogHandler.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <UUID.h>
#include <TryLocker.h>

2
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "AvatarMixerClientData.h"

2
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -22,7 +22,7 @@
#include <AvatarData.h>
#include <NodeData.h>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SimpleMovingAverage.h>
#include <UUIDHasher.h>

2
assignment-client/src/entities/EntityNodeData.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_EntityNodeData_h
#define hifi_EntityNodeData_h
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "../octree/OctreeQueryNode.h"

2
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
View file

@ -12,7 +12,7 @@
#include <limits>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PerfStat.h>
#include "OctreeServer.h"

2
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -14,7 +14,7 @@
#include <cstring>
#include <cstdio>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <UUID.h>

2
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -11,7 +11,7 @@
#include <NodeList.h>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PerfStat.h>
#include "OctreeSendThread.h"

2
assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
View file

@ -13,7 +13,7 @@
#include <HifiSockAddr.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include "OctreeServerDatagramProcessor.h"

2
domain-server/src/DomainServer.cpp
View file

@ -29,7 +29,7 @@
#include <JSONBreakableMarshal.h>
#include <LogUtils.h>
#include <NetworkingConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SettingHandle.h>
#include <SharedUtil.h>
#include <ShutdownEventListener.h>

2
domain-server/src/DomainServerNodeData.cpp
View file

@ -14,7 +14,7 @@
#include <QtCore/QVariant>
#include <JSONBreakableMarshal.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "DomainServerNodeData.h"

2
ice-server/src/IceServer.cpp
View file

@ -12,7 +12,7 @@
#include <QTimer>
#include <LimitedNodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include "IceServer.h"

2
interface/src/Application.cpp
View file

@ -81,7 +81,7 @@
#include <ObjectMotionState.h>
#include <OctalCode.h>
#include <OctreeSceneStats.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PathUtils.h>
#include <PerfStat.h>
#include <PhysicsEngine.h>

4
interface/src/Application.h
View file

@ -31,7 +31,7 @@
#include <NodeList.h>
#include <OctreeQuery.h>
#include <OffscreenUi.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PhysicalEntitySimulation.h>
#include <PhysicsEngine.h>
#include <ScriptEngine.h>
@ -48,7 +48,6 @@
#include "FileLogger.h"
#include "GLCanvas.h"
#include "Menu.h"
#include "PacketHeaders.h"
#include "Physics.h"
#include "Stars.h"
#include "avatar/Avatar.h"
@ -56,6 +55,7 @@
#include "devices/SixenseManager.h"
#include "scripting/ControllerScriptingInterface.h"
#include "scripting/WebWindowClass.h"
#include "udt/PacketHeaders.h"
#include "ui/BandwidthDialog.h"
#include "ui/HMDToolsDialog.h"
#include "ui/ModelsBrowser.h"

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

@ -28,7 +28,7 @@
#include <LODManager.h>
#include <NodeList.h>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PathUtils.h>
#include <PerfStat.h>
#include <SharedUtil.h>

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

@ -26,7 +26,7 @@
#include <DependencyManager.h>
#include <GeometryUtil.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PathUtils.h>
#include <PerfStat.h>
#include <ShapeCollider.h>

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -50,7 +50,7 @@ extern "C" {
#include <soxr.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PositionalAudioStream.h>
#include <SettingHandle.h>
#include <SharedUtil.h>

2
libraries/audio/src/AudioInjector.cpp
View file

@ -13,7 +13,7 @@
#include <QtCore/QDataStream>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <UUID.h>
#include <soxr.h>

2
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -16,7 +16,7 @@
#include <QtCore/QDebug>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "AudioLogging.h"

2
libraries/audio/src/InboundAudioStream.cpp
View file

@ -12,7 +12,7 @@
#include <glm/glm.hpp>
#include "InboundAudioStream.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
const int STARVE_HISTORY_CAPACITY = 50;

2
libraries/audio/src/InboundAudioStream.h
View file

@ -14,7 +14,7 @@
#include <NodeData.h>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <StDev.h>
#include "AudioRingBuffer.h"

2
libraries/audio/src/InjectedAudioStream.cpp
View file

@ -14,7 +14,7 @@
#include <QtCore/QDataStream>
#include <QtCore/qdebug.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <UUID.h>
#include "InjectedAudioStream.h"

2
libraries/audio/src/MixedAudioStream.h
View file

@ -13,7 +13,7 @@
#define hifi_MixedAudioStream_h
#include "InboundAudioStream.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
class MixedAudioStream : public InboundAudioStream {
public:

2
libraries/audio/src/PositionalAudioStream.cpp
View file

@ -18,7 +18,7 @@
#include <QtCore/QDataStream>
#include <Node.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <UUID.h>
PositionalAudioStream::PositionalAudioStream(PositionalAudioStream::Type type, bool isStereo, const InboundAudioStream::Settings& settings) :

2
libraries/avatars/src/AvatarData.cpp
View file

@ -21,7 +21,7 @@
#include <NetworkAccessManager.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <GLMHelpers.h>
#include <StreamUtils.h>
#include <UUID.h>

2
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -10,7 +10,7 @@
//
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include "AvatarLogging.h"

2
libraries/entities/src/EntityEditPacketSender.cpp
View file

@ -12,7 +12,7 @@
#include <assert.h>
#include <PerfStat.h>
#include <OctalCode.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "EntityEditPacketSender.h"
#include "EntitiesLogging.h"
#include "EntityItem.h"

2
libraries/entities/src/EntityItemID.cpp
View file

@ -12,7 +12,7 @@
#include <QtCore/QObject>
#include <QDebug>
#include <BufferParser.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "RegisteredMetaTypes.h"
#include "EntityItemID.h"

2
libraries/entities/src/EntityTreeHeadlessViewer.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_EntityTreeHeadlessViewer_h
#define hifi_EntityTreeHeadlessViewer_h
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <Octree.h>
#include <OctreePacketData.h>

2
libraries/environment/src/EnvironmentData.cpp
View file

@ -12,7 +12,7 @@
#include <cstring>
#include "EnvironmentData.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
// initial values from Sean O'Neil's GPU Gems entry (http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html),
// GameEngine.cpp

2
libraries/networking/src/AccountManager.cpp
View file

@ -24,7 +24,7 @@
#include <SettingHandle.h>
#include "NodeList.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "RSAKeypairGenerator.h"
#include "SharedUtil.h"

2
libraries/networking/src/Assignment.cpp
View file

@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "SharedUtil.h"
#include "UUID.h"

2
libraries/networking/src/DomainHandler.cpp
View file

@ -16,7 +16,7 @@
#include "Assignment.h"
#include "HifiSockAddr.h"
#include "NodeList.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "SharedUtil.h"
#include "UserActivityLogger.h"
#include "NetworkLogging.h"

2
libraries/networking/src/LimitedNodeList.cpp
View file

@ -33,6 +33,8 @@
#include "UUID.h"
#include "NetworkLogging.h"
#include "udt/udt.h"
const char SOLO_NODE_TYPES[2] = {
NodeType::AvatarMixer,
NodeType::AudioMixer

2
libraries/networking/src/LimitedNodeList.h
View file

@ -38,7 +38,7 @@
#include "DomainHandler.h"
#include "Node.h"
#include "NLPacket.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "NLPacketList.h"
#include "UUIDHasher.h"

2
libraries/networking/src/NLPacket.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_NLPacket_h
#define hifi_NLPacket_h
#include "Packet.h"
#include "udt/Packet.h"
class NLPacket : public Packet {
Q_OBJECT

2
libraries/networking/src/Node.h
View file

@ -24,7 +24,7 @@
#include "NetworkPeer.h"
#include "NodeData.h"
#include "NodeType.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "SimpleMovingAverage.h"
#include "MovingPercentile.h"

2
libraries/networking/src/NodeList.cpp
View file

@ -25,7 +25,7 @@
#include "HifiSockAddr.h"
#include "JSONBreakableMarshal.h"
#include "NodeList.h"
#include "PacketHeaders.h"
#include "udt/PacketHeaders.h"
#include "SharedUtil.h"
#include "UUID.h"
#include "NetworkLogging.h"

2
libraries/networking/src/udt/Packet.cpp
View file

@ -11,7 +11,7 @@
#include "Packet.h"
#include "LimitedNodeList.h"
#include "../LimitedNodeList.h"
qint64 Packet::localHeaderSize(PacketType::Value type) {
qint64 size = numBytesForArithmeticCodedPacketType(type) + sizeof(PacketVersion) +

2
libraries/octree/src/JurisdictionListener.cpp
View file

@ -13,7 +13,7 @@
#include <OctalCode.h>
#include <SharedUtil.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "JurisdictionListener.h"
JurisdictionListener::JurisdictionListener(NodeType_t type) :

2
libraries/octree/src/JurisdictionMap.cpp
View file

@ -16,7 +16,7 @@
#include <DependencyManager.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <OctalCode.h>
#include "OctreeLogging.h"

2
libraries/octree/src/JurisdictionSender.cpp
View file

@ -13,7 +13,7 @@
#include <OctalCode.h>
#include <SharedUtil.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "JurisdictionSender.h"

2
libraries/octree/src/Octree.cpp
View file

@ -36,7 +36,7 @@
#include <LogHandler.h>
#include <NetworkAccessManager.h>
#include <OctalCode.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include <Shape.h>
#include <PathUtils.h>

2
libraries/octree/src/OctreeEditPacketSender.cpp
View file

@ -14,7 +14,7 @@
#include <PerfStat.h>
#include <OctalCode.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "OctreeLogging.h"
#include "OctreeEditPacketSender.h"

2
libraries/octree/src/OctreeEditPacketSender.h
View file

@ -13,7 +13,7 @@
#define hifi_OctreeEditPacketSender_h
#include <PacketSender.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "JurisdictionMap.h"
#include "SentPacketHistory.h"

2
libraries/octree/src/OctreeHeadlessViewer.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_OctreeHeadlessViewer_h
#define hifi_OctreeHeadlessViewer_h
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <SharedUtil.h>
#include "JurisdictionListener.h"

2
libraries/octree/src/OctreePacketData.h
View file

@ -27,7 +27,7 @@
#include <QUuid>
#include <LimitedNodeList.h> // for MAX_PACKET_SIZE
#include <PacketHeaders.h> // for MAX_PACKET_HEADER_BYTES
#include <udt/PacketHeaders.h> // for MAX_PACKET_HEADER_BYTES
#include <SharedUtil.h>
#include <ShapeInfo.h>
#include <BackgroundMode.h>

2
libraries/octree/src/OctreeQuery.cpp
View file

@ -10,7 +10,7 @@
//
#include <GLMHelpers.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "OctreeConstants.h"
#include "OctreeQuery.h"

2
libraries/octree/src/OctreeRenderer.h
View file

@ -17,7 +17,7 @@
#include <QObject>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <RenderArgs.h>
#include <SharedUtil.h>

2
libraries/octree/src/OctreeSceneStats.cpp
View file

@ -15,7 +15,7 @@
#include <LogHandler.h>
#include <NumericalConstants.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include "OctreePacketData.h"
#include "OctreeElement.h"

2
libraries/render-utils/src/Environment.cpp
View file

@ -17,7 +17,7 @@
#include <GeometryUtil.h>
#include <NumericalConstants.h>
#include <OctreePacketData.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <PathUtils.h>
#include <SharedUtil.h>

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -24,7 +24,7 @@
#include <EntityScriptingInterface.h>
#include <NetworkAccessManager.h>
#include <NodeList.h>
#include <PacketHeaders.h>
#include <udt/PacketHeaders.h>
#include <UUID.h>
#include "AnimationObject.h"