Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:29:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

moving EntityCollisionSystem back to entities lib

Browse source
This commit is contained in:
Andrew Meadows 2014-12-02 11:05:17 -08:00
parent 3781c23480
commit 0814949e4c
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.h
View file

@ -30,6 +30,7 @@
#include <QUndoStack> #include <QUndoStack>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <EntityCollisionSystem.h>
#include <EntityEditPacketSender.h> #include <EntityEditPacketSender.h>
#include <NetworkPacket.h> #include <NetworkPacket.h>
#include <NodeList.h> #include <NodeList.h>
@ -59,7 +60,6 @@
#include "devices/SixenseManager.h" #include "devices/SixenseManager.h"
#include "devices/Visage.h" #include "devices/Visage.h"
#include "devices/DdeFaceTracker.h" #include "devices/DdeFaceTracker.h"
#include "entities/EntityCollisionSystem.h"
#include "entities/EntityTreeRenderer.h" #include "entities/EntityTreeRenderer.h"
#include "renderer/AmbientOcclusionEffect.h" #include "renderer/AmbientOcclusionEffect.h"
#include "renderer/DeferredLightingEffect.h" #include "renderer/DeferredLightingEffect.h"

9
interface/src/entities/EntityCollisionSystem.cpp → libraries/entities/src/EntityCollisionSystem.cpp
View file

@ -19,12 +19,11 @@
#include <PerfStat.h> #include <PerfStat.h>
#include <SphereShape.h> #include <SphereShape.h>
#include <EntityItem.h>
#include <EntityEditPacketSender.h>
#include <EntityTree.h>
#include <EntityTreeElement.h>
#include "EntityCollisionSystem.h" #include "EntityCollisionSystem.h"
#include "EntityEditPacketSender.h"
#include "EntityItem.h"
#include "EntityTreeElement.h"
#include "EntityTree.h"
const int MAX_COLLISIONS_PER_Entity = 16; const int MAX_COLLISIONS_PER_Entity = 16;

5
interface/src/entities/EntityCollisionSystem.h → libraries/entities/src/EntityCollisionSystem.h
View file

@ -20,12 +20,13 @@
#include <AvatarHashMap.h> #include <AvatarHashMap.h>
#include <CollisionInfo.h> #include <CollisionInfo.h>
#include <EntityItem.h>
#include <OctreePacketData.h> #include <OctreePacketData.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <SimpleEntitySimulation.h>
#include <VoxelDetail.h> #include <VoxelDetail.h>
#include "EntityItem.h"
#include "SimpleEntitySimulation.h"
class AbstractAudioInterface; class AbstractAudioInterface;
class AvatarData; class AvatarData;
class EntityEditPacketSender; class EntityEditPacketSender;