Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-17 17:19:03 +0000
committerStijn Buys <ingar@osirion.org>2010-10-17 17:19:03 +0000
commitd6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b (patch)
tree63744dff093a8b23f65d9c68b922b678805647d9 /src/core/zone.h
parentea6e6bb769d713ac55114c1940626f13e384ebed (diff)
core bullet physics support,
initial vstrafe support
Diffstat (limited to 'src/core/zone.h')
-rw-r--r--src/core/zone.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/zone.h b/src/core/zone.h
index 38a9298..f040939 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -19,6 +19,7 @@ class Zone;
}
#include "core/entity.h"
+#include "core/physics.h"
namespace core
{
@@ -140,6 +141,11 @@ public:
/// remove an entity from this zone
void remove(Entity *entity);
+ /// physics world for this zone
+ inline btDiscreteDynamicsWorld *physics() {
+ return zone_bullet_world;
+ }
+
private:
unsigned int zone_id;
@@ -149,6 +155,9 @@ private:
static Registry zone_registry;
Entity *zone_defaultview;
+
+ btAxisSweep3 *zone_bullet_cache;
+ btDiscreteDynamicsWorld *zone_bullet_world;
};
}