mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Clean up bullet includes

Browse Source
This commit is contained in:
jvoisin 2022-06-04 19:48:28 +02:00
parent 33c66e3d5e
commit 72a6d1f69f
11 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/navmeshtool/worldspacedata.hpp
View File

@ -8,7 +8,6 @@
#include <components/resource/bulletshape.hpp>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include <BulletCollision/Gimpact/btBoxCollision.h>
#include <LinearMath/btVector3.h>
#include <memory>

2
apps/openmw/mwphysics/hasspherecollisioncallback.hpp
View File

@ -2,9 +2,7 @@
#define OPENMW_MWPHYSICS_HASSPHERECOLLISIONCALLBACK_H
#include <LinearMath/btVector3.h>
#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <algorithm>

1
apps/openmw/mwphysics/object.cpp
View File

@ -9,7 +9,6 @@
#include <components/bullethelpers/collisionobject.hpp>
#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include <LinearMath/btTransform.h>

5
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -1,8 +1,5 @@
#include "physicssystem.hpp"
#include <LinearMath/btIDebugDraw.h>
#include <LinearMath/btVector3.h>
#include <memory>
#include <algorithm>
#include <vector>
@ -14,12 +11,12 @@
#include <BulletCollision/CollisionShapes/btConeShape.h>
#include <BulletCollision/CollisionShapes/btSphereShape.h>
#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
#include <LinearMath/btVector3.h>
#include <LinearMath/btQuickprof.h>
#include <components/nifbullet/bulletnifloader.hpp>

1
apps/openmw/mwphysics/projectile.cpp
View File

@ -1,7 +1,6 @@
#include <memory>
#include <BulletCollision/CollisionShapes/btSphereShape.h>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <components/misc/convert.hpp>

3
apps/openmw/mwworld/worldimp.cpp
View File

@ -4,9 +4,6 @@
#include <osg/ComputeBoundsVisitor>
#include <osg/Timer>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include <MyGUI_TextIterator.h>
#include <components/debug/debuglog.hpp>

2
apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
View File

@ -7,6 +7,8 @@
#include <components/detournavigator/navmeshdbutils.hpp>
#include <components/detournavigator/dbrefgeometryobject.hpp>
#include <BulletCollision/CollisionShapes/btBoxShape.h>
#include <DetourNavMesh.h>
#include <gtest/gtest.h>

2
components/bullethelpers/aabb.hpp
View File

@ -1,10 +1,8 @@
#ifndef OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
#define OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
#include <LinearMath/btVector3.h>
#include <LinearMath/btTransform.h>
#include <BulletCollision/CollisionShapes/btCollisionShape.h>
#include <BulletCollision/Gimpact/btBoxCollision.h>
inline bool operator==(const btAABB& lhs, const btAABB& rhs)
{

6
components/bullethelpers/operators.hpp
View File

@ -6,10 +6,10 @@
#include <ostream>
#include <tuple>
#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
#include <BulletCollision/CollisionShapes/btCompoundShape.h>
#include <BulletCollision/CollisionShapes/btBoxShape.h>
#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
#include <LinearMath/btTransform.h>
#include <LinearMath/btAabbUtil2.h>
inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
{

2
components/detournavigator/asyncnavmeshupdater.cpp
View File

@ -11,6 +11,8 @@
#include <components/misc/thread.hpp>
#include <components/loadinglistener/loadinglistener.hpp>
#include <BulletCollision/CollisionShapes/btBoxShape.h>
#include <DetourNavMesh.h>
#include <osg/Stats>

1
components/detournavigator/navmeshmanager.hpp
View File

@ -8,7 +8,6 @@
#include "waitconditiontype.hpp"
#include "heightfieldshape.hpp"
#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
#include <osg/Vec3f>