add_static_collider event added, deactivations update

Outerra · Sep 12, 2017 · 0f7ee0c · 0f7ee0c
1 parent 67606a8
commit 0f7ee0c
Show file tree

Hide file tree

Showing 7 changed files with 749 additions and 716 deletions.
diff --git a/src/otbullet/discrete_dynamics_world.h b/src/otbullet/discrete_dynamics_world.h
@@ -240,6 +240,11 @@ class discrete_dynamics_world : public btDiscreteDynamicsWorld
         return _stats;
     }
 
+    const void * get_context() { return _context; }
+
+    void get_obb(const btCollisionShape * cs, const btTransform& t, double3& cen, float3x3& basis);
+
+
 protected:
 
 	virtual void internalSingleStepSimulation(btScalar timeStep) override;
@@ -253,7 +258,6 @@ class discrete_dynamics_world : public btDiscreteDynamicsWorld
     fn_process_tree_collision _tree_collision;
 
     void process_tree_collisions(btScalar time_step);
-    void get_obb(const btCollisionShape * cs, const btTransform& t, double3& cen, float3x3& basis);
     void oob_to_aabb(const btVector3& src_cen,
         const btMatrix3x3& src_basis,
         const btVector3& dst_cen,

diff --git a/src/otbullet/otbullet.hpp b/src/otbullet/otbullet.hpp
@@ -123,6 +123,8 @@ class physics : public policy_intrusive_base
         float3* norm, 
         double3* hitpoint);
 
+    ifc_event void add_static_collider(const void * context, btCollisionObject * obj, const double3& cen, const float3x3& basis);
+
     ifc_event void log(const coid::token& text);
 
 private:

diff --git a/src/otbullet/otbullet.intergen.cpp b/src/otbullet/otbullet.intergen.cpp