Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 19:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

entities lib now depends on bullet (if exists)

Browse source
This commit is contained in:
Andrew Meadows 2014-11-05 17:05:26 -08:00
parent fb0eddcc32
commit 57f13f3a7c
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities/CMakeLists.txt
View file

@ -4,6 +4,7 @@ set(TARGET_NAME entities)
setup_hifi_library(Network Script)
include_glm()
include_bullet()
link_hifi_libraries(shared octree fbx networking animation physics)

9
libraries/entities/src/EntityItem.h
View file

@ -34,6 +34,10 @@ class EntityTreeElementExtraEncodeData;
#define DONT_ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() = 0;
#define ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() { };
#ifdef USE_BULLET_PHYSICS
class EntityMotionState;
#endif // USE_BULLET_PHYSICS
/// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
/// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
@ -254,6 +258,11 @@ public:
void applyHardCollision(const CollisionInfo& collisionInfo);
virtual const Shape& getCollisionShapeInMeters() const { return _collisionShape; }
virtual bool contains(const glm::vec3& point) const { return getAABox().contains(point); }
#ifdef USE_BULLET_PHYSICS
//EntityMotionState* createMotionState() = 0;
EntityMotionState* createMotionState() { return NULL; }
#endif // USE_BULLET_PHYSICS
protected:
virtual void initFromEntityItemID(const EntityItemID& entityItemID); // maybe useful to allow subclasses to init